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/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" diff --git a/frameworks/kits/extension/BUILD.gn b/frameworks/kits/extension/BUILD.gn index 6c58304..5bc0190 100644 --- a/frameworks/kits/extension/BUILD.gn +++ b/frameworks/kits/extension/BUILD.gn @@ -44,7 +44,6 @@ config("ability_config") { "${aafwk_path}/interfaces/kits/native/ability/native/distributed_ability_runtime", "${AAFWK_INNERKITS_PATH}/ability_manager/include/continuation", "${aafwk_path}/interfaces/kits/native/ability/native/continuation/kits", - "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk/main/cpp/include", "${aafwk_path}/interfaces/kits/native/appkit/app/task", "//foundation/ability/ability_runtime/frameworks/js/napi/aafwk/inner/napi_common", ] @@ -118,7 +117,6 @@ ohos_shared_library("wallpaperextension") { "${aafwk_path}/frameworks/native/ability/native:static_subscriber_ipc", "${aafwk_path}/frameworks/native/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/interfaces/kits/napi/napi_wallpaper_ability.cpp b/interfaces/kits/napi/napi_wallpaper_ability.cpp index c77b902..1ab17ce 100644 --- a/interfaces/kits/napi/napi_wallpaper_ability.cpp +++ b/interfaces/kits/napi/napi_wallpaper_ability.cpp @@ -335,7 +335,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: 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/BUILD.gn b/services/BUILD.gn index 28659ea..b997cbc 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 e6be217..ea771d9 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", ]