Signed-off-by: sodanotgreen <limengzheng@huawei.com>
This commit is contained in:
sodanotgreen 2024-07-23 18:08:36 +08:00
parent ecae6fa437
commit 0966194f9e
2 changed files with 10 additions and 15 deletions

View File

@ -38,7 +38,6 @@ void NAPIDataAbilityObserver::ReleaseJSCallback()
}
SafeReleaseJSCallback();
}
void NAPIDataAbilityObserver::SafeReleaseJSCallback()
@ -100,13 +99,11 @@ void NAPIDataAbilityObserver::SafeReleaseJSCallback()
void NAPIDataAbilityObserver::SetEnv(const napi_env &env)
{
env_ = env;
}
void NAPIDataAbilityObserver::SetCallbackRef(const napi_ref &ref)
{
ref_ = ref;
}
static void OnChangeJSThreadWorker(uv_work_t *work, int status)
@ -132,7 +129,6 @@ static void OnChangeJSThreadWorker(uv_work_t *work, int status)
onCB = nullptr;
delete work;
work = nullptr;
}
void NAPIDataAbilityObserver::CallJsMethod()
@ -198,7 +194,6 @@ void NAPIDataAbilityObserver::OnChange()
work = nullptr;
}
}
}
} // namespace AppExecFwk

View File

@ -995,7 +995,7 @@ std::vector<std::string> FAAbilityThread::GetFileTypes(const Uri &uri, const std
int FAAbilityThread::OpenFile(const Uri &uri, const std::string &mode)
{
TAG_LOGD(AAFwkTag::FA, "Called.");
TAG_LOGD(AAFwkTag::FA, "called");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return -1;
@ -1005,7 +1005,7 @@ int FAAbilityThread::OpenFile(const Uri &uri, const std::string &mode)
int FAAbilityThread::OpenRawFile(const Uri &uri, const std::string &mode)
{
TAG_LOGD(AAFwkTag::FA, "Called.");
TAG_LOGD(AAFwkTag::FA, "called");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return -1;
@ -1016,7 +1016,7 @@ int FAAbilityThread::OpenRawFile(const Uri &uri, const std::string &mode)
int FAAbilityThread::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value)
{
TAG_LOGD(AAFwkTag::FA, "Called.");
TAG_LOGD(AAFwkTag::FA, "called");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return -1;
@ -1028,7 +1028,7 @@ int FAAbilityThread::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value
std::shared_ptr<AppExecFwk::PacMap> FAAbilityThread::Call(
const Uri &uri, const std::string &method, const std::string &arg, const AppExecFwk::PacMap &pacMap)
{
TAG_LOGD(AAFwkTag::FA, "Called.");
TAG_LOGD(AAFwkTag::FA, "called");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return nullptr;
@ -1040,7 +1040,7 @@ std::shared_ptr<AppExecFwk::PacMap> FAAbilityThread::Call(
int FAAbilityThread::Update(
const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates)
{
TAG_LOGD(AAFwkTag::FA, "Called.");
TAG_LOGD(AAFwkTag::FA, "called");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return -1;
@ -1051,7 +1051,7 @@ int FAAbilityThread::Update(
int FAAbilityThread::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates)
{
TAG_LOGD(AAFwkTag::FA, "Called.");
TAG_LOGD(AAFwkTag::FA, "called");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return -1;
@ -1062,7 +1062,7 @@ int FAAbilityThread::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicat
std::shared_ptr<NativeRdb::AbsSharedResultSet> FAAbilityThread::Query(
const Uri &uri, std::vector<std::string> &columns, const NativeRdb::DataAbilityPredicates &predicates)
{
TAG_LOGD(AAFwkTag::FA, "Called.");
TAG_LOGD(AAFwkTag::FA, "called");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return nullptr;
@ -1073,7 +1073,7 @@ std::shared_ptr<NativeRdb::AbsSharedResultSet> FAAbilityThread::Query(
std::string FAAbilityThread::GetType(const Uri &uri)
{
TAG_LOGD(AAFwkTag::FA, "Called.");
TAG_LOGD(AAFwkTag::FA, "called");
std::string type;
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
@ -1085,7 +1085,7 @@ std::string FAAbilityThread::GetType(const Uri &uri)
bool FAAbilityThread::Reload(const Uri &uri, const AppExecFwk::PacMap &extras)
{
TAG_LOGD(AAFwkTag::FA, "Called.");
TAG_LOGD(AAFwkTag::FA, "called");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return false;
@ -1095,7 +1095,7 @@ bool FAAbilityThread::Reload(const Uri &uri, const AppExecFwk::PacMap &extras)
int FAAbilityThread::BatchInsert(const Uri &uri, const std::vector<NativeRdb::ValuesBucket> &values)
{
TAG_LOGD(AAFwkTag::FA, "Called.");
TAG_LOGD(AAFwkTag::FA, "called");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return -1;