From 45b06e2d31b264648460ba680711879323612d9b Mon Sep 17 00:00:00 2001 From: Justin_Hu Date: Wed, 10 Sep 2025 09:59:26 +0000 Subject: [PATCH 1/8] fix crash for volume key Signed-off-by: Justin_Hu --- service/key_command/src/setting_datashare.cpp | 2 ++ .../include/touch_drawing_manager.h | 4 +++ .../src/touch_drawing_manager.cpp | 25 ++++++++++++++++--- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/service/key_command/src/setting_datashare.cpp b/service/key_command/src/setting_datashare.cpp index 2fbd4672b0..45a7245038 100644 --- a/service/key_command/src/setting_datashare.cpp +++ b/service/key_command/src/setting_datashare.cpp @@ -82,6 +82,7 @@ ErrCode SettingDataShare::GetLongValue(const std::string& key, int64_t& value, c ErrCode SettingDataShare::GetBoolValue(const std::string& key, bool& value, const std::string &strUri) { + MMI_HILOGI("HGC 888 GetBoolValue enter----> value: %{public}d", value); std::string valueStr; ErrCode ret = GetStringValue(key, valueStr, strUri); if (ret != ERR_OK) { @@ -93,6 +94,7 @@ ErrCode SettingDataShare::GetBoolValue(const std::string& key, bool& value, cons return ERR_INVALID_VALUE; } value = ((valueStr == "true") || (valueStr == "1")); + MMI_HILOGI("HGC 888 GetBoolValue end----> value: %{public}d", value); return ERR_OK; } diff --git a/service/window_manager/include/touch_drawing_manager.h b/service/window_manager/include/touch_drawing_manager.h index 63a0998477..ed769b6c43 100644 --- a/service/window_manager/include/touch_drawing_manager.h +++ b/service/window_manager/include/touch_drawing_manager.h @@ -62,6 +62,8 @@ private: ITouchDrawingHandler* LoadTouchDrawingHandler(); ITouchDrawingHandler* GetTouchDrawingHandler() const; void UnloadTouchDrawingHandler(); + // hgc 999 + int32_t UpdatePointerMode(); private: OLD::DisplayInfo displayInfo_ {}; @@ -75,6 +77,8 @@ private: std::unique_ptr> touchDrawingHandler_ { nullptr, ComponentManager::Component(nullptr, nullptr) }; int32_t timerId_ { -1 }; + // hgc 999 定义锁保护数据 + std::mutex pointerModeMutex_; }; #define TOUCH_DRAWING_MGR ::OHOS::DelayedSingleton::GetInstance() diff --git a/service/window_manager/src/touch_drawing_manager.cpp b/service/window_manager/src/touch_drawing_manager.cpp index 36048b13d0..7fb3ba4e57 100644 --- a/service/window_manager/src/touch_drawing_manager.cpp +++ b/service/window_manager/src/touch_drawing_manager.cpp @@ -224,12 +224,31 @@ void TouchDrawingManager::CreateObserver() MMI_HILOGI("Setup observer of show-touch-position"); pointerMode_.SwitchName = POINTER_POSITION_SWITCH_NAME; CreatePointerObserver(pointerMode_); - SettingDataShare::GetInstance(MULTIMODAL_INPUT_SERVICE_ID). - GetBoolValue(POINTER_POSITION_SWITCH_NAME, pointerMode_.isShow); + // hgc 999 调度阻塞形的，抛到其他线程上 + CHKPV(delegateProxy_); + delegateProxy_->OnPostSyncTask(std::bind(&TouchDrawingManager::UpdatePointerMode, this)); + // SettingDataShare::GetInstance(MULTIMODAL_INPUT_SERVICE_ID). + // GetBoolValue(POINTER_POSITION_SWITCH_NAME, pointerMode_.isShow); } MMI_HILOGD("The bubbleMode_:%{public}d, pointerMode_:%{public}d", bubbleMode_.isShow, pointerMode_.isShow); } +int32_t TouchDrawingManager::UpdatePointerMode() +{ + bool isShow = false; + auto ret = SettingDataShare::GetInstance(MULTIMODAL_INPUT_SERVICE_ID) + .GetBoolValue(POINTER_POSITION_SWITCH_NAME, isShow); + if (ret != RET_OK) { + MMI_HILOGE("Get value from setting data fail"); + return ret; + } + // 使用互斥锁保护对 pointerMode_.isShow 的访问 + std::lock_guard lock(pointerModeMutex_); + pointerMode_.isShow = isShow; + MMI_HILOGI("HGC 999 Pointer mode isShow: %{public}d", pointerMode_.isShow); + return RET_OK; +} + template void TouchDrawingManager::CreateBubbleObserver(T &item) { @@ -243,7 +262,7 @@ void TouchDrawingManager::CreateBubbleObserver(T &item) } CHKPV(delegateProxy_); delegateProxy_->OnPostSyncTask(std::bind(&TouchDrawingManager::UpdateBubbleData, this)); - MMI_HILOGI("The key:%{public}s, statusValue:%{public}d", key.c_str(), item.isShow); + MMI_HILOGI("HMY 001 The key:%{public}s, statusValue:%{public}d", key.c_str(), item.isShow); }; sptr statusObserver = SettingDataShare::GetInstance(MULTIMODAL_INPUT_SERVICE_ID) .CreateObserver(item.SwitchName, updateFunc); -- Gitee From 21212c024d67c6d0b38d7af571cd2d35e8ad6b56 Mon Sep 17 00:00:00 2001 From: Justin_Hu Date: Thu, 11 Sep 2025 03:43:01 +0000 Subject: [PATCH 2/8] add log Signed-off-by: Justin_Hu --- service/key_command/src/setting_datashare.cpp | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/service/key_command/src/setting_datashare.cpp b/service/key_command/src/setting_datashare.cpp index 45a7245038..e21c76494f 100644 --- a/service/key_command/src/setting_datashare.cpp +++ b/service/key_command/src/setting_datashare.cpp @@ -189,27 +189,40 @@ ErrCode SettingDataShare::UnregisterObserver(const sptr& observ ErrCode SettingDataShare::GetStringValue(const std::string& key, std::string& value, const std::string &strUri) { BytraceAdapter::StartDataShare(key); + MMI_HILOGE("HGC 001 enter--->"); std::string callingIdentity = IPCSkeleton::ResetCallingIdentity(); + MMI_HILOGE("HGC 001 end<---"); + MMI_HILOGE("HGC 002 enter--->"); auto helper = CreateDataShareHelper(strUri); + MMI_HILOGE("HGC 002 end<---"); if (helper == nullptr) { + MMI_HILOGE("HGC 002 helper is null"); IPCSkeleton::SetCallingIdentity(callingIdentity); BytraceAdapter::StopDataShare(); return ERR_NO_INIT; } std::vector columns = {SETTING_COLUMN_VALUE}; + MMI_HILOGE("HGC 003 enter--->"); DataShare::DataSharePredicates predicates; predicates.EqualTo(SETTING_COLUMN_KEYWORD, key); + MMI_HILOGE("HGC 003 end<---"); + MMI_HILOGE("HGC 004 enter--->"); Uri uri(AssembleUri(key, strUri)); auto resultSet = helper->Query(uri, predicates, columns); + MMI_HILOGE("HGC 004 end<---"); + MMI_HILOGE("HGC 005 enter--->"); ReleaseDataShareHelper(helper); if (resultSet == nullptr) { + MMI_HILOGE("HGC 005 resultSet is null"); IPCSkeleton::SetCallingIdentity(callingIdentity); BytraceAdapter::StopDataShare(); return ERR_INVALID_OPERATION; } + MMI_HILOGE("HGC 005 end<---"); int32_t count = 0; resultSet->GetRowCount(count); if (count == 0) { + MMI_HILOGE("HGC 006 count is 0"); IPCSkeleton::SetCallingIdentity(callingIdentity); BytraceAdapter::StopDataShare(); return ERR_NAME_NOT_FOUND; @@ -218,12 +231,15 @@ ErrCode SettingDataShare::GetStringValue(const std::string& key, std::string& va resultSet->GoToRow(tmpRow); int32_t ret = resultSet->GetString(tmpRow, value); if (ret != RET_OK) { + MMI_HILOGE("HGC 006 ret is err"); IPCSkeleton::SetCallingIdentity(callingIdentity); BytraceAdapter::StopDataShare(); return ERR_INVALID_VALUE; } resultSet->Close(); + MMI_HILOGE("HGC 007 enter--->"); IPCSkeleton::SetCallingIdentity(callingIdentity); + MMI_HILOGE("HGC 007 end<---"); BytraceAdapter::StopDataShare(); return ERR_OK; } @@ -261,6 +277,7 @@ ErrCode SettingDataShare::PutStringValue( std::shared_ptr SettingDataShare::CreateDataShareHelper(const std::string &strUri) { + MMI_HILOGE("HGC 008 enter--->"); BytraceAdapter::StartDataShare(strUri); if (remoteObj_ == nullptr) { std::lock_guard lock(mutex_); @@ -270,12 +287,15 @@ std::shared_ptr SettingDataShare::CreateDataShareHel remoteObj_ = sam->CheckSystemAbility(MULTIMODAL_INPUT_SERVICE_ID); } } + MMI_HILOGE("HGC 008 end<---"); std::pair> ret; + MMI_HILOGE("HGC 009 enter--->"); if (strUri.empty()) { ret = DataShare::DataShareHelper::Create(remoteObj_, SETTING_URI_PROXY, SETTINGS_DATA_EXT_URI); } else { ret = DataShare::DataShareHelper::Create(remoteObj_, strUri, ""); } + MMI_HILOGE("HGC 009 end<---"); BytraceAdapter::StopDataShare(); return ret.second; } -- Gitee From 6bdf7fe5b01e0eb11542639faf4df576a6afeda4 Mon Sep 17 00:00:00 2001 From: Justin_Hu Date: Thu, 11 Sep 2025 07:48:20 +0000 Subject: [PATCH 3/8] code review Signed-off-by: Justin_Hu --- service/key_command/src/setting_datashare.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/service/key_command/src/setting_datashare.cpp b/service/key_command/src/setting_datashare.cpp index e21c76494f..47ccc9abb3 100644 --- a/service/key_command/src/setting_datashare.cpp +++ b/service/key_command/src/setting_datashare.cpp @@ -289,11 +289,13 @@ std::shared_ptr SettingDataShare::CreateDataShareHel } MMI_HILOGE("HGC 008 end<---"); std::pair> ret; - MMI_HILOGE("HGC 009 enter--->"); - if (strUri.empty()) { - ret = DataShare::DataShareHelper::Create(remoteObj_, SETTING_URI_PROXY, SETTINGS_DATA_EXT_URI); - } else { - ret = DataShare::DataShareHelper::Create(remoteObj_, strUri, ""); + MMI_HILOGE("HGC 009 enter isDataShareReady_:%{public}d--->", isDataShareReady_); + if (isDataShareReady_) { + if (strUri.empty()) { + ret = DataShare::DataShareHelper::Create(remoteObj_, SETTING_URI_PROXY, SETTINGS_DATA_EXT_URI); + } else { + ret = DataShare::DataShareHelper::Create(remoteObj_, strUri, ""); + } } MMI_HILOGE("HGC 009 end<---"); BytraceAdapter::StopDataShare(); -- Gitee From 2536441215e4f259b3dabad69711bcc51b41352d Mon Sep 17 00:00:00 2001 From: Justin_Hu Date: Thu, 11 Sep 2025 08:37:19 +0000 Subject: [PATCH 4/8] code review Signed-off-by: Justin_Hu --- service/key_command/src/setting_datashare.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/service/key_command/src/setting_datashare.cpp b/service/key_command/src/setting_datashare.cpp index 47ccc9abb3..f173fd0d4e 100644 --- a/service/key_command/src/setting_datashare.cpp +++ b/service/key_command/src/setting_datashare.cpp @@ -289,8 +289,9 @@ std::shared_ptr SettingDataShare::CreateDataShareHel } MMI_HILOGE("HGC 008 end<---"); std::pair> ret; - MMI_HILOGE("HGC 009 enter isDataShareReady_:%{public}d--->", isDataShareReady_); - if (isDataShareReady_) { + CHKPP(instance_); + MMI_HILOGE("HGC 009 enter isDataShareReady_:%{public}d--->", instance_->isDataShareReady_); + if (instance_->isDataShareReady_) { if (strUri.empty()) { ret = DataShare::DataShareHelper::Create(remoteObj_, SETTING_URI_PROXY, SETTINGS_DATA_EXT_URI); } else { -- Gitee From 4ce10ac4e427ea0fd79d13ab7d1d73b49a5479c6 Mon Sep 17 00:00:00 2001 From: Justin_Hu Date: Thu, 11 Sep 2025 12:25:17 +0000 Subject: [PATCH 5/8] code refactoring Signed-off-by: Justin_Hu --- service/key_command/src/setting_datashare.cpp | 23 +---------------- .../include/touch_drawing_manager.h | 4 --- .../src/touch_drawing_manager.cpp | 25 +++---------------- 3 files changed, 4 insertions(+), 48 deletions(-) diff --git a/service/key_command/src/setting_datashare.cpp b/service/key_command/src/setting_datashare.cpp index f173fd0d4e..f59253e8e6 100644 --- a/service/key_command/src/setting_datashare.cpp +++ b/service/key_command/src/setting_datashare.cpp @@ -82,7 +82,6 @@ ErrCode SettingDataShare::GetLongValue(const std::string& key, int64_t& value, c ErrCode SettingDataShare::GetBoolValue(const std::string& key, bool& value, const std::string &strUri) { - MMI_HILOGI("HGC 888 GetBoolValue enter----> value: %{public}d", value); std::string valueStr; ErrCode ret = GetStringValue(key, valueStr, strUri); if (ret != ERR_OK) { @@ -94,7 +93,6 @@ ErrCode SettingDataShare::GetBoolValue(const std::string& key, bool& value, cons return ERR_INVALID_VALUE; } value = ((valueStr == "true") || (valueStr == "1")); - MMI_HILOGI("HGC 888 GetBoolValue end----> value: %{public}d", value); return ERR_OK; } @@ -189,40 +187,27 @@ ErrCode SettingDataShare::UnregisterObserver(const sptr& observ ErrCode SettingDataShare::GetStringValue(const std::string& key, std::string& value, const std::string &strUri) { BytraceAdapter::StartDataShare(key); - MMI_HILOGE("HGC 001 enter--->"); std::string callingIdentity = IPCSkeleton::ResetCallingIdentity(); - MMI_HILOGE("HGC 001 end<---"); - MMI_HILOGE("HGC 002 enter--->"); auto helper = CreateDataShareHelper(strUri); - MMI_HILOGE("HGC 002 end<---"); if (helper == nullptr) { - MMI_HILOGE("HGC 002 helper is null"); IPCSkeleton::SetCallingIdentity(callingIdentity); BytraceAdapter::StopDataShare(); return ERR_NO_INIT; } std::vector columns = {SETTING_COLUMN_VALUE}; - MMI_HILOGE("HGC 003 enter--->"); DataShare::DataSharePredicates predicates; predicates.EqualTo(SETTING_COLUMN_KEYWORD, key); - MMI_HILOGE("HGC 003 end<---"); - MMI_HILOGE("HGC 004 enter--->"); Uri uri(AssembleUri(key, strUri)); auto resultSet = helper->Query(uri, predicates, columns); - MMI_HILOGE("HGC 004 end<---"); - MMI_HILOGE("HGC 005 enter--->"); ReleaseDataShareHelper(helper); if (resultSet == nullptr) { - MMI_HILOGE("HGC 005 resultSet is null"); IPCSkeleton::SetCallingIdentity(callingIdentity); BytraceAdapter::StopDataShare(); return ERR_INVALID_OPERATION; } - MMI_HILOGE("HGC 005 end<---"); int32_t count = 0; resultSet->GetRowCount(count); if (count == 0) { - MMI_HILOGE("HGC 006 count is 0"); IPCSkeleton::SetCallingIdentity(callingIdentity); BytraceAdapter::StopDataShare(); return ERR_NAME_NOT_FOUND; @@ -231,15 +216,12 @@ ErrCode SettingDataShare::GetStringValue(const std::string& key, std::string& va resultSet->GoToRow(tmpRow); int32_t ret = resultSet->GetString(tmpRow, value); if (ret != RET_OK) { - MMI_HILOGE("HGC 006 ret is err"); IPCSkeleton::SetCallingIdentity(callingIdentity); BytraceAdapter::StopDataShare(); return ERR_INVALID_VALUE; } resultSet->Close(); - MMI_HILOGE("HGC 007 enter--->"); IPCSkeleton::SetCallingIdentity(callingIdentity); - MMI_HILOGE("HGC 007 end<---"); BytraceAdapter::StopDataShare(); return ERR_OK; } @@ -277,7 +259,6 @@ ErrCode SettingDataShare::PutStringValue( std::shared_ptr SettingDataShare::CreateDataShareHelper(const std::string &strUri) { - MMI_HILOGE("HGC 008 enter--->"); BytraceAdapter::StartDataShare(strUri); if (remoteObj_ == nullptr) { std::lock_guard lock(mutex_); @@ -287,10 +268,9 @@ std::shared_ptr SettingDataShare::CreateDataShareHel remoteObj_ = sam->CheckSystemAbility(MULTIMODAL_INPUT_SERVICE_ID); } } - MMI_HILOGE("HGC 008 end<---"); std::pair> ret; CHKPP(instance_); - MMI_HILOGE("HGC 009 enter isDataShareReady_:%{public}d--->", instance_->isDataShareReady_); + MMI_HILOGI("DataShare is ready [%{public}d]", instance_->isDataShareReady_); if (instance_->isDataShareReady_) { if (strUri.empty()) { ret = DataShare::DataShareHelper::Create(remoteObj_, SETTING_URI_PROXY, SETTINGS_DATA_EXT_URI); @@ -298,7 +278,6 @@ std::shared_ptr SettingDataShare::CreateDataShareHel ret = DataShare::DataShareHelper::Create(remoteObj_, strUri, ""); } } - MMI_HILOGE("HGC 009 end<---"); BytraceAdapter::StopDataShare(); return ret.second; } diff --git a/service/window_manager/include/touch_drawing_manager.h b/service/window_manager/include/touch_drawing_manager.h index ed769b6c43..63a0998477 100644 --- a/service/window_manager/include/touch_drawing_manager.h +++ b/service/window_manager/include/touch_drawing_manager.h @@ -62,8 +62,6 @@ private: ITouchDrawingHandler* LoadTouchDrawingHandler(); ITouchDrawingHandler* GetTouchDrawingHandler() const; void UnloadTouchDrawingHandler(); - // hgc 999 - int32_t UpdatePointerMode(); private: OLD::DisplayInfo displayInfo_ {}; @@ -77,8 +75,6 @@ private: std::unique_ptr> touchDrawingHandler_ { nullptr, ComponentManager::Component(nullptr, nullptr) }; int32_t timerId_ { -1 }; - // hgc 999 定义锁保护数据 - std::mutex pointerModeMutex_; }; #define TOUCH_DRAWING_MGR ::OHOS::DelayedSingleton::GetInstance() diff --git a/service/window_manager/src/touch_drawing_manager.cpp b/service/window_manager/src/touch_drawing_manager.cpp index 7fb3ba4e57..36048b13d0 100644 --- a/service/window_manager/src/touch_drawing_manager.cpp +++ b/service/window_manager/src/touch_drawing_manager.cpp @@ -224,31 +224,12 @@ void TouchDrawingManager::CreateObserver() MMI_HILOGI("Setup observer of show-touch-position"); pointerMode_.SwitchName = POINTER_POSITION_SWITCH_NAME; CreatePointerObserver(pointerMode_); - // hgc 999 调度阻塞形的，抛到其他线程上 - CHKPV(delegateProxy_); - delegateProxy_->OnPostSyncTask(std::bind(&TouchDrawingManager::UpdatePointerMode, this)); - // SettingDataShare::GetInstance(MULTIMODAL_INPUT_SERVICE_ID). - // GetBoolValue(POINTER_POSITION_SWITCH_NAME, pointerMode_.isShow); + SettingDataShare::GetInstance(MULTIMODAL_INPUT_SERVICE_ID). + GetBoolValue(POINTER_POSITION_SWITCH_NAME, pointerMode_.isShow); } MMI_HILOGD("The bubbleMode_:%{public}d, pointerMode_:%{public}d", bubbleMode_.isShow, pointerMode_.isShow); } -int32_t TouchDrawingManager::UpdatePointerMode() -{ - bool isShow = false; - auto ret = SettingDataShare::GetInstance(MULTIMODAL_INPUT_SERVICE_ID) - .GetBoolValue(POINTER_POSITION_SWITCH_NAME, isShow); - if (ret != RET_OK) { - MMI_HILOGE("Get value from setting data fail"); - return ret; - } - // 使用互斥锁保护对 pointerMode_.isShow 的访问 - std::lock_guard lock(pointerModeMutex_); - pointerMode_.isShow = isShow; - MMI_HILOGI("HGC 999 Pointer mode isShow: %{public}d", pointerMode_.isShow); - return RET_OK; -} - template void TouchDrawingManager::CreateBubbleObserver(T &item) { @@ -262,7 +243,7 @@ void TouchDrawingManager::CreateBubbleObserver(T &item) } CHKPV(delegateProxy_); delegateProxy_->OnPostSyncTask(std::bind(&TouchDrawingManager::UpdateBubbleData, this)); - MMI_HILOGI("HMY 001 The key:%{public}s, statusValue:%{public}d", key.c_str(), item.isShow); + MMI_HILOGI("The key:%{public}s, statusValue:%{public}d", key.c_str(), item.isShow); }; sptr statusObserver = SettingDataShare::GetInstance(MULTIMODAL_INPUT_SERVICE_ID) .CreateObserver(item.SwitchName, updateFunc); -- Gitee From 48a63d31d0a4cc7e9ad984d99291c680eb9e16f6 Mon Sep 17 00:00:00 2001 From: Justin_Hu Date: Thu, 11 Sep 2025 14:02:31 +0000 Subject: [PATCH 6/8] code review Signed-off-by: Justin_Hu --- service/key_command/src/setting_datashare.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/service/key_command/src/setting_datashare.cpp b/service/key_command/src/setting_datashare.cpp index f59253e8e6..394377211a 100644 --- a/service/key_command/src/setting_datashare.cpp +++ b/service/key_command/src/setting_datashare.cpp @@ -269,7 +269,11 @@ std::shared_ptr SettingDataShare::CreateDataShareHel } } std::pair> ret; - CHKPP(instance_); + if (instance_ == nullptr) { + MMI_HILOGE("instance_ is null"); + BytraceAdapter::StopDataShare(); + return nullptr; + } MMI_HILOGI("DataShare is ready [%{public}d]", instance_->isDataShareReady_); if (instance_->isDataShareReady_) { if (strUri.empty()) { -- Gitee From c3e29dc5790b22ccf62fc54232d1a3dd1768ef94 Mon Sep 17 00:00:00 2001 From: Justin_Hu Date: Thu, 11 Sep 2025 14:08:47 +0000 Subject: [PATCH 7/8] code review Signed-off-by: Justin_Hu --- service/key_command/src/setting_datashare.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/service/key_command/src/setting_datashare.cpp b/service/key_command/src/setting_datashare.cpp index 394377211a..136dd83569 100644 --- a/service/key_command/src/setting_datashare.cpp +++ b/service/key_command/src/setting_datashare.cpp @@ -269,13 +269,8 @@ std::shared_ptr SettingDataShare::CreateDataShareHel } } std::pair> ret; - if (instance_ == nullptr) { - MMI_HILOGE("instance_ is null"); - BytraceAdapter::StopDataShare(); - return nullptr; - } - MMI_HILOGI("DataShare is ready [%{public}d]", instance_->isDataShareReady_); - if (instance_->isDataShareReady_) { + if (instance_ != nullptr && instance_->isDataShareReady_) { + MMI_HILOGI("DataShare is ready [%{public}d]", instance_->isDataShareReady_); if (strUri.empty()) { ret = DataShare::DataShareHelper::Create(remoteObj_, SETTING_URI_PROXY, SETTINGS_DATA_EXT_URI); } else { -- Gitee From 1ddeb93d2c0e87ee522b0899ae7875c63b2f291b Mon Sep 17 00:00:00 2001 From: Justin_Hu Date: Thu, 11 Sep 2025 14:11:15 +0000 Subject: [PATCH 8/8] code review Signed-off-by: Justin_Hu --- service/key_command/src/setting_datashare.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/key_command/src/setting_datashare.cpp b/service/key_command/src/setting_datashare.cpp index 136dd83569..6e8a7def4a 100644 --- a/service/key_command/src/setting_datashare.cpp +++ b/service/key_command/src/setting_datashare.cpp @@ -270,7 +270,7 @@ std::shared_ptr SettingDataShare::CreateDataShareHel } std::pair> ret; if (instance_ != nullptr && instance_->isDataShareReady_) { - MMI_HILOGI("DataShare is ready [%{public}d]", instance_->isDataShareReady_); + MMI_HILOGI("DataShare is ready"); if (strUri.empty()) { ret = DataShare::DataShareHelper::Create(remoteObj_, SETTING_URI_PROXY, SETTINGS_DATA_EXT_URI); } else { -- Gitee