From 49090055e5c5caaae901a694acf870ddbf067137 Mon Sep 17 00:00:00 2001
From: zhangyafei-echo <zhangyafei12@huawei.com>
Date: Tue, 19 Mar 2024 20:18:34 +0800
Subject: [PATCH] Add permission to scb.

Signed-off-by: zhangyafei-echo <zhangyafei12@huawei.com>
Change-Id: I4de11541836903fd02b10346b8a153f7a5a541ca
---
 CODEOWNERS                                                 | 4 +++-
 .../js/napi/ui_extension_ability/ui_extension_ability.js   | 7 +------
 services/abilitymgr/src/ability_manager_proxy.cpp          | 2 +-
 services/abilitymgr/src/ability_manager_service.cpp        | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 1c5a9523775..2df0e6d3c7b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -13,4 +13,6 @@
 
 # any change to xxx_ipc_interface_code.h needs to be reviewed by @leonchan5
 interfaces/inner_api/ability_manager/include/ability_manager_ipc_interface_code.h @leonchan5
-interfaces/inner_api/app_manager/include/appmgr/app_mgr_ipc_interface_code.h @leonchan5
\ No newline at end of file
+interfaces/inner_api/app_manager/include/appmgr/app_mgr_ipc_interface_code.h @leonchan5
+services/common/include/ui_extension_utils.h @li-weifeng2
+services/common/include/ui_extension_utils.h @zhangyafei-echo
\ No newline at end of file
diff --git a/frameworks/js/napi/ui_extension_ability/ui_extension_ability.js b/frameworks/js/napi/ui_extension_ability/ui_extension_ability.js
index b3074f000f8..bef5b4aa696 100755
--- a/frameworks/js/napi/ui_extension_ability/ui_extension_ability.js
+++ b/frameworks/js/napi/ui_extension_ability/ui_extension_ability.js
@@ -17,18 +17,13 @@ let ExtensionAbility = requireNapi('app.ability.ExtensionAbility');
 
 class UIExtensionAbility extends ExtensionAbility {
   onCreate(want) {
-    console.log('onCreate, want:' + want.abilityName);
+    console.log('onCreate');
   }
 
   onRequest(want, startId) {
     console.log('onRequest, want:' + want.abilityName + ', startId:' + startId);
   }
 
-  onLoadContent() {
-    console.log('onLoadContent');
-    return '';
-  }
-
   onDestroy() {
     console.log('onDestroy');
   }
diff --git a/services/abilitymgr/src/ability_manager_proxy.cpp b/services/abilitymgr/src/ability_manager_proxy.cpp
index 4eb1005a60e..530332b1fb2 100644
--- a/services/abilitymgr/src/ability_manager_proxy.cpp
+++ b/services/abilitymgr/src/ability_manager_proxy.cpp
@@ -4795,7 +4795,7 @@ int32_t AbilityManagerProxy::GetUIExtensionRootHostInfo(const sptr<IRemoteObject
     }
 
     MessageParcel data;
-    if (!WriteInterfaceToken (data)) {
+    if (!WriteInterfaceToken(data)) {
         HILOG_ERROR("Write remote object failed.");
         return INNER_ERR;
     }
diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp
index 1507bd32505..2025797049a 100644
--- a/services/abilitymgr/src/ability_manager_service.cpp
+++ b/services/abilitymgr/src/ability_manager_service.cpp
@@ -9763,8 +9763,8 @@ int32_t AbilityManagerService::GetUIExtensionRootHostInfo(const sptr<IRemoteObje
     HILOG_DEBUG("Get ui extension host info.");
     CHECK_POINTER_AND_RETURN(token, ERR_INVALID_VALUE);
 
-    if (!AAFwk::PermissionVerification::GetInstance()->IsSACall()) {
-        HILOG_ERROR("Not sa call.");
+    if (!AAFwk::PermissionVerification::GetInstance()->IsSACall() && !CheckCallingTokenId(BUNDLE_NAME_SCENEBOARD)) {
+        HILOG_ERROR("Permission deny.");
         return ERR_PERMISSION_DENIED;
     }
 
-- 
Gitee