From fcf460393ee1c956ba1794a80f852e7fb60b7e88 Mon Sep 17 00:00:00 2001 From: zhang-junxi66 Date: Wed, 8 Jun 2022 15:20:09 +0800 Subject: [PATCH 1/5] Signed-off-by: zhang-junxi66 Changes to be commited: --- interfaces/kits/napi/napi_wallpaper_ability.cpp | 2 +- interfaces/kits/napi/napi_wallpaper_ability.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/kits/napi/napi_wallpaper_ability.cpp b/interfaces/kits/napi/napi_wallpaper_ability.cpp index 487358f..5a00f8c 100644 --- a/interfaces/kits/napi/napi_wallpaper_ability.cpp +++ b/interfaces/kits/napi/napi_wallpaper_ability.cpp @@ -337,7 +337,7 @@ napi_value NAPI_ScreenshotLiveWallpaper(napi_env env, napi_callback_info info) return ret; } -std::shared_ptr colorChangeListener_; +thread_local std::shared_ptr colorChangeListener_; napi_value NAPI_On(napi_env env, napi_callback_info info) { diff --git a/interfaces/kits/napi/napi_wallpaper_ability.h b/interfaces/kits/napi/napi_wallpaper_ability.h index bdb32a3..0e076e6 100644 --- a/interfaces/kits/napi/napi_wallpaper_ability.h +++ b/interfaces/kits/napi/napi_wallpaper_ability.h @@ -127,7 +127,7 @@ struct SetContextInfo : public AsyncCall::Context { } }; -extern std::shared_ptr colorChangeListener_; +extern thread_local std::shared_ptr colorChangeListener_; class NapiWallpaperAbility : public WallpaperMgrService::WallpaperColorChangeListener { public: From 20349ea6205c4ce0c73d0ee11d3f40938427c3e6 Mon Sep 17 00:00:00 2001 From: lovechinamo Date: Wed, 15 Jun 2022 19:59:37 +0800 Subject: [PATCH 2/5] Signed-off-by: lovechinamo Changes to be committed: --- interfaces/kits/napi/wallpaper_js_util.cpp | 2 +- services/src/wallpaper_service.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/interfaces/kits/napi/wallpaper_js_util.cpp b/interfaces/kits/napi/wallpaper_js_util.cpp index b18cb53..8e34988 100644 --- a/interfaces/kits/napi/wallpaper_js_util.cpp +++ b/interfaces/kits/napi/wallpaper_js_util.cpp @@ -34,7 +34,7 @@ std::string WallpaperJSUtil::Convert2String(napi_env env, napi_value jsString) if (maxLen <= 0) { return std::string(); } - char *buf = new char[maxLen + 1]; + char *buf = new(std::nothrow) char[maxLen + 1]; if (buf == nullptr) { return std::string(); } diff --git a/services/src/wallpaper_service.cpp b/services/src/wallpaper_service.cpp index 9943f7b..4e73d39 100644 --- a/services/src/wallpaper_service.cpp +++ b/services/src/wallpaper_service.cpp @@ -214,11 +214,13 @@ void WallpaperService::StartExt() want.SetElementName("com.example.ohosproject.hmservice", "WallpaperExtAbility"); AAFwk::AbilityManagerClient::GetInstance()->Connect(); HILOG_INFO("WallpaperService::Startwhile"); - while (1) { + bool flag = true; + while (flag) { HILOG_INFO("WallpaperService::StartAbility"); time++; ret = AAFwk::AbilityManagerClient::GetInstance()->StartAbility(want); if (ret == 0 || time == TEN) { + flag = false; break; } sleep(SIX); From 81111225d48d1977a82ed5668f6e2d0cff9a467a Mon Sep 17 00:00:00 2001 From: lovechinamo Date: Thu, 16 Jun 2022 20:05:48 +0800 Subject: [PATCH 3/5] Signed-off-by: lovechinamo Changes to be committed: modified: services/src/wallpaper_service.cpp --- services/src/wallpaper_service.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/src/wallpaper_service.cpp b/services/src/wallpaper_service.cpp index 4e73d39..9943f7b 100644 --- a/services/src/wallpaper_service.cpp +++ b/services/src/wallpaper_service.cpp @@ -214,13 +214,11 @@ void WallpaperService::StartExt() want.SetElementName("com.example.ohosproject.hmservice", "WallpaperExtAbility"); AAFwk::AbilityManagerClient::GetInstance()->Connect(); HILOG_INFO("WallpaperService::Startwhile"); - bool flag = true; - while (flag) { + while (1) { HILOG_INFO("WallpaperService::StartAbility"); time++; ret = AAFwk::AbilityManagerClient::GetInstance()->StartAbility(want); if (ret == 0 || time == TEN) { - flag = false; break; } sleep(SIX); From 3e8b9aba6cc7a21303adb353fd122870447729ac Mon Sep 17 00:00:00 2001 From: xbingle Date: Fri, 17 Jun 2022 21:14:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E9=83=A8=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xbingle --- bundle.json | 1 - frameworks/innerkitsimpl/wallpaper_manager/BUILD.gn | 1 - frameworks/kits/extension/BUILD.gn | 2 -- services/BUILD.gn | 1 - services/src/wallpaper_service.cpp | 1 - test/BUILD.gn | 1 - 6 files changed, 7 deletions(-) diff --git a/bundle.json b/bundle.json index 27fddff..10af523 100644 --- a/bundle.json +++ b/bundle.json @@ -33,7 +33,6 @@ "hisysevent_native", "hiviewdfx_hilog_native", "ipc", - "permission_standard", "safwk", "samgr_standard", "startup_l2", diff --git a/frameworks/innerkitsimpl/wallpaper_manager/BUILD.gn b/frameworks/innerkitsimpl/wallpaper_manager/BUILD.gn index 001bdfa..e9ab0f6 100644 --- a/frameworks/innerkitsimpl/wallpaper_manager/BUILD.gn +++ b/frameworks/innerkitsimpl/wallpaper_manager/BUILD.gn @@ -20,7 +20,6 @@ config("wallpaper_manager_config") { "include", "//base/miscservices/wallpaper/services/include", "//base/miscservices/wallpaper/utils/include", - "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk/main/cpp/include/permission", ] cflags_cc = [ "-fexceptions" ] } diff --git a/frameworks/kits/extension/BUILD.gn b/frameworks/kits/extension/BUILD.gn index 000eaf8..7a536a9 100644 --- a/frameworks/kits/extension/BUILD.gn +++ b/frameworks/kits/extension/BUILD.gn @@ -45,7 +45,6 @@ config("ability_config") { "${AAFWK_KITS_DIR}/include/distributed_ability_runtime", "${AAFWK_INNERKITS_PATH}/ability_manager/include/continuation", "${AAFWK_KITS_DIR}/include/continuation/kits", - "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk/main/cpp/include", "${aafwk_kits_path}/appkit/native/app/include/task", "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/inner/napi_common", ] @@ -119,7 +118,6 @@ ohos_shared_library("wallpaperextension") { "${aafwk_kits_path}/ability/ability_runtime:ability_context_native", "${aafwk_kits_path}/appkit:app_context", "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager:wallpapermanager", - "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/arkui/napi:ace_napi", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common", diff --git a/services/BUILD.gn b/services/BUILD.gn index 52ccae2..04cf369 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -100,7 +100,6 @@ ohos_shared_library("wallpaper_service") { "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "permission_standard:libpermissionsdk_standard", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", diff --git a/services/src/wallpaper_service.cpp b/services/src/wallpaper_service.cpp index 9943f7b..789ddf8 100644 --- a/services/src/wallpaper_service.cpp +++ b/services/src/wallpaper_service.cpp @@ -36,7 +36,6 @@ #include "time_util.h" #include "image_packer.h" #include "bundle_mgr_interface.h" -#include "permission/permission_kit.h" #include "iservice_registry.h" #include "image/bitmap.h" #include "pixel_map.h" diff --git a/test/BUILD.gn b/test/BUILD.gn index d5c4af9..fbc9e48 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -49,7 +49,6 @@ ohos_unittest("wallpaper_test") { "common_event_service:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "permission_standard:libpermissionsdk_standard", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", ] From cd16e469de294cbc3cbf014c455ad620a5810677 Mon Sep 17 00:00:00 2001 From: xbingle Date: Fri, 17 Jun 2022 21:47:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xbingle --- .../innerkitsimpl/wallpaper_manager/src/wallpaper_manager.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/frameworks/innerkitsimpl/wallpaper_manager/src/wallpaper_manager.cpp b/frameworks/innerkitsimpl/wallpaper_manager/src/wallpaper_manager.cpp index f14f7a7..65aa981 100644 --- a/frameworks/innerkitsimpl/wallpaper_manager/src/wallpaper_manager.cpp +++ b/frameworks/innerkitsimpl/wallpaper_manager/src/wallpaper_manager.cpp @@ -30,7 +30,6 @@ #include "iservice_registry.h" #include "system_ability_definition.h" #include "i_wallpaper_service.h" -#include "permission.h" #include "image_source.h" #include "image_type.h" #include "image_packer.h"