Merge branch 'master' of gitee.com:openharmony/miscservices_wallpaper into master

bundle.json

@@ -33,7 +33,6 @@
           "hisysevent_native",
           "hiviewdfx_hilog_native",
           "ipc",
-          "permission_standard",
           "safwk",
           "samgr_standard",
           "startup_l2",

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" ]
 }

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"

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",

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<WallpaperMgrService::WallpaperColorChangeListener> colorChangeListener_;
+thread_local std::shared_ptr<WallpaperMgrService::WallpaperColorChangeListener> colorChangeListener_;
 
 napi_value NAPI_On(napi_env env, napi_callback_info info)
 {

interfaces/kits/napi/napi_wallpaper_ability.h

@@ -127,7 +127,7 @@ struct SetContextInfo : public AsyncCall::Context {
     }
 };
 
-extern std::shared_ptr<WallpaperMgrService::WallpaperColorChangeListener> colorChangeListener_;
+extern thread_local std::shared_ptr<WallpaperMgrService::WallpaperColorChangeListener> colorChangeListener_;
 
 class NapiWallpaperAbility : public WallpaperMgrService::WallpaperColorChangeListener {
 public:

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();
     }

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",
 

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"

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",
   ]