From b347274fcc0bc3f09106c7faa903eb1c9538148b Mon Sep 17 00:00:00 2001
From: yudechen <chenyude@huawei.com>
Date: Tue, 8 Mar 2022 09:13:05 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=8C=87=E5=AE=9A=E9=83=A8=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yudechen <chenyude@huawei.com>
Change-Id: Ie774cc04ac8e91a4fdcbd660ab81e784889f9f54
---
 tools/accesstoken/BUILD.gn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/accesstoken/BUILD.gn b/tools/accesstoken/BUILD.gn
index ab8eb964b..0abe59f32 100644
--- a/tools/accesstoken/BUILD.gn
+++ b/tools/accesstoken/BUILD.gn
@@ -47,6 +47,9 @@ ohos_source_set("tools_atm_source_set") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
+
+  subsystem_name = "security"
+  part_name = "access_token"
 }
 
 ohos_executable("atm") {
-- 
Gitee


From b9d91a01a512955403b552e9dc90488aebd263f6 Mon Sep 17 00:00:00 2001
From: zwx1066281 <zhouyan128@huawei.com>
Date: Fri, 11 Mar 2022 10:05:59 +0800
Subject: [PATCH 2/5] update PermissionManager.hap code

Signed-off-by: zwx1066281 <zhouyan128@huawei.com>
---
 .../entry/src/main/config.json                |  19 +-
 .../src/main/ets/MainAbility}/app.ets         |   6 +-
 .../MainAbility/pages/index.ets}              |  48 ++-
 .../pages/second.ets}                         |  22 +-
 .../ohos/permissionmanager/MyApplication.java |  25 --
 .../main/resources/base/element/string.json   |   2 +-
 .../entry/src/ohosTest/ets/default/app.ets    |  26 --
 .../src/ohosTest/ets/default/i18n/en-US.json  |   8 -
 .../src/ohosTest/ets/default/i18n/zh-CN.json  |   8 -
 .../ets/default/pages/index/index.ets         |  64 ---
 .../ohosTest/ets/test/ExampleJsunit.test.ets  |  27 --
 .../entry/src/ohosTest/ets/test/List.test.ets |  20 -
 .../permissionmanager/ExampleOhosTest.java    |  29 --
 .../resources/base/element/string.json        |  12 -
 .../ohosTest/resources/base/media/icon.png    | Bin 6790 -> 0 bytes
 .../permissionmanager/src/main/config.json    |  30 +-
 .../src/main/ets/GrantAbility}/app.ets        |   0
 .../common/components/dialog.ets              |  91 +++--
 .../common/model/bundle.ets                   |   0
 .../common/model/permissionGroup.ets          |   0
 .../common/utils/constant.ets                 |   0
 .../common/utils/utils.ets                    |   0
 .../pages/dialogPlus.ets                      |  56 ++-
 .../main/ets/{default => MainAbility}/app.ets |   0
 .../common/components/alphabeticalIndex.ets   |   0
 .../common/components/backBar.ets             |   0
 .../common/components/dialog.ets              |   0
 .../common/components/search.ets              |   0
 .../common/model/permissionGroup.ets          |  36 +-
 .../common/utils/constant.ets                 |  31 +-
 .../common/utils/utils.ets                    |   0
 .../pages/application-secondary.ets           |  12 +-
 .../pages/application-tertiary.ets            |  20 +-
 .../pages/authority-management.ets            |  97 +++--
 .../pages/authority-secondary.ets             |   8 +-
 .../pages/authority-tertiary-groups.ets       | 382 ++++++++++++++++++
 .../pages/authority-tertiary.ets              |  12 +-
 .../pages/other-permissions.ets               |   8 +-
 .../resources/ar/properties/string.json       |   0
 .../resources/dark/properties/string.json     |   0
 .../resources/default/media/icon_actived.png  | Bin
 .../resources/default/media/icon_normal.png   | Bin
 .../resources/default/properties/string.json  |   0
 .../resources/en/properties/string.json       |   0
 .../resources/light/properties/string.json    |   0
 .../resources/zh/properties/string.json       |   0
 .../ohos/permissionmanager/MainAbility.java   |  32 --
 .../ohos/permissionmanager/MyApplication.java |  25 --
 .../main/resources/base/element/string.json   |   4 +-
 .../src/ohosTest/ets/default/app.ets          |  26 --
 .../src/ohosTest/ets/default/i18n/en-US.json  |   8 -
 .../src/ohosTest/ets/default/i18n/zh-CN.json  |   8 -
 .../ets/default/pages/index/index.ets         |  64 ---
 .../ohosTest/ets/test/ExampleJsunit.test.ets  |  27 --
 .../src/ohosTest/ets/test/List.test.ets       |  20 -
 .../permissionmanager/ExampleOhosTest.java    |  29 --
 .../resources/base/element/string.json        |  12 -
 .../ohosTest/resources/base/media/icon.png    | Bin 6790 -> 0 bytes
 58 files changed, 690 insertions(+), 664 deletions(-)
 rename frameworks/com.ohos.permissionmanager/{permissionmanager/src/main/ets/dynamic => entry/src/main/ets/MainAbility}/app.ets (97%)
 rename frameworks/com.ohos.permissionmanager/entry/src/main/{java/com/ohos/permissionmanager/MainAbility.java => ets/MainAbility/pages/index.ets} (43%)
 rename frameworks/com.ohos.permissionmanager/entry/src/main/ets/{default/pages/index.ets => MainAbility/pages/second.ets} (68%)
 delete mode 100644 frameworks/com.ohos.permissionmanager/entry/src/main/java/com/ohos/permissionmanager/MyApplication.java
 delete mode 100644 frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/app.ets
 delete mode 100644 frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/i18n/en-US.json
 delete mode 100644 frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/i18n/zh-CN.json
 delete mode 100644 frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/pages/index/index.ets
 delete mode 100644 frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/test/ExampleJsunit.test.ets
 delete mode 100644 frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/test/List.test.ets
 delete mode 100644 frameworks/com.ohos.permissionmanager/entry/src/ohosTest/java/com/ohos/permissionmanager/ExampleOhosTest.java
 delete mode 100644 frameworks/com.ohos.permissionmanager/entry/src/ohosTest/resources/base/element/string.json
 delete mode 100644 frameworks/com.ohos.permissionmanager/entry/src/ohosTest/resources/base/media/icon.png
 rename frameworks/com.ohos.permissionmanager/{entry/src/main/ets/default => permissionmanager/src/main/ets/GrantAbility}/app.ets (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{dynamic => GrantAbility}/common/components/dialog.ets (75%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{dynamic => GrantAbility}/common/model/bundle.ets (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{dynamic => GrantAbility}/common/model/permissionGroup.ets (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{dynamic => GrantAbility}/common/utils/constant.ets (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{dynamic => GrantAbility}/common/utils/utils.ets (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{dynamic => GrantAbility}/pages/dialogPlus.ets (55%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/app.ets (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/common/components/alphabeticalIndex.ets (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/common/components/backBar.ets (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/common/components/dialog.ets (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/common/components/search.ets (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/common/model/permissionGroup.ets (97%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/common/utils/constant.ets (93%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/common/utils/utils.ets (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/pages/application-secondary.ets (97%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/pages/application-tertiary.ets (96%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/pages/authority-management.ets (89%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/pages/authority-secondary.ets (95%)
 create mode 100644 frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-tertiary-groups.ets
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/pages/authority-tertiary.ets (97%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/pages/other-permissions.ets (95%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/resources/ar/properties/string.json (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/resources/dark/properties/string.json (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/resources/default/media/icon_actived.png (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/resources/default/media/icon_normal.png (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/resources/default/properties/string.json (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/resources/en/properties/string.json (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/resources/light/properties/string.json (100%)
 rename frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/{default => MainAbility}/resources/zh/properties/string.json (100%)
 delete mode 100644 frameworks/com.ohos.permissionmanager/permissionmanager/src/main/java/com/ohos/permissionmanager/MainAbility.java
 delete mode 100644 frameworks/com.ohos.permissionmanager/permissionmanager/src/main/java/com/ohos/permissionmanager/MyApplication.java
 delete mode 100644 frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/app.ets
 delete mode 100644 frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/i18n/en-US.json
 delete mode 100644 frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/i18n/zh-CN.json
 delete mode 100644 frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/pages/index/index.ets
 delete mode 100644 frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/test/ExampleJsunit.test.ets
 delete mode 100644 frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/test/List.test.ets
 delete mode 100644 frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/java/com/ohos/permissionmanager/ExampleOhosTest.java
 delete mode 100644 frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/resources/base/element/string.json
 delete mode 100644 frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/resources/base/media/icon.png

diff --git a/frameworks/com.ohos.permissionmanager/entry/src/main/config.json b/frameworks/com.ohos.permissionmanager/entry/src/main/config.json
index 165e0d3bd..fb8fc1e71 100644
--- a/frameworks/com.ohos.permissionmanager/entry/src/main/config.json
+++ b/frameworks/com.ohos.permissionmanager/entry/src/main/config.json
@@ -11,10 +11,10 @@
   "module": {
     "package": "com.ohos.permissionmanager",
     "name": ".MyApplication",
-    "mainAbility": "com.ohos.permissionmanager.MainAbility",
+    "mainAbility": ".MainAbility",
+    "srcPath": "",
     "deviceType": [
-      "phone",
-      "tablet"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -34,10 +34,14 @@
             ]
           }
         ],
+        "orientation": "unspecified",
         "visible": true,
-        "name": "com.ohos.permissionmanager.MainAbility",
+        "srcPath": "MainAbility",
+        "name": ".MainAbility",
+        "srcLanguage": "ets",
         "icon": "$media:icon",
-        "description": "$string:mainability_description",
+        "description": "$string:description_mainability",
+        "formsEnabled": false,
         "label": "$string:entry_MainAbility",
         "type": "page",
         "launchType": "standard"
@@ -50,9 +54,10 @@
           "type": "pageAbility"
         },
         "pages": [
-          "pages/index"
+          "pages/index",
+          "pages/second"
         ],
-        "name": "default",
+        "name": ".MainAbility",
         "window": {
           "designWidth": 720,
           "autoDesignWidth": false
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/app.ets b/frameworks/com.ohos.permissionmanager/entry/src/main/ets/MainAbility/app.ets
similarity index 97%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/app.ets
rename to frameworks/com.ohos.permissionmanager/entry/src/main/ets/MainAbility/app.ets
index 9ae634daa..1007addd5 100644
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/app.ets
+++ b/frameworks/com.ohos.permissionmanager/entry/src/main/ets/MainAbility/app.ets
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-export default {
+ 
+ export default {
   onCreate() {
     console.info('Application onCreate')
   },
   onDestroy() {
     console.info('Application onDestroy')
   },
-}
+}
\ No newline at end of file
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/main/java/com/ohos/permissionmanager/MainAbility.java b/frameworks/com.ohos.permissionmanager/entry/src/main/ets/MainAbility/pages/index.ets
similarity index 43%
rename from frameworks/com.ohos.permissionmanager/entry/src/main/java/com/ohos/permissionmanager/MainAbility.java
rename to frameworks/com.ohos.permissionmanager/entry/src/main/ets/MainAbility/pages/index.ets
index 4b7057089..a438be437 100644
--- a/frameworks/com.ohos.permissionmanager/entry/src/main/java/com/ohos/permissionmanager/MainAbility.java
+++ b/frameworks/com.ohos.permissionmanager/entry/src/main/ets/MainAbility/pages/index.ets
@@ -13,19 +13,41 @@
  * limitations under the License.
  */
 
-package com.ohos.permissionmanager;
+import router from '@system.router';
 
-import ohos.ace.ability.AceAbility;
-import ohos.aafwk.content.Intent;
-
-public class MainAbility extends AceAbility {
-    @Override
-    public void onStart(Intent intent) {
-        super.onStart(intent);
-    }
+async function routePage() {
+  let options = {
+    uri: 'pages/second'
+  }
+  try {
+    await router.push(options)
+  } catch (err) {
+    console.error(`fail callback, code: ${err.code}, msg: ${err.msg}`)
+  }
+}
 
-    @Override
-    public void onStop() {
-        super.onStop();
+@Entry
+@Component
+struct Index {
+  build() {
+    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
+      Text('Hello World')
+        .fontSize(50)
+        .fontWeight(FontWeight.Bold)
+      Button() {
+        Text('next page')
+          .fontSize(25)
+          .fontWeight(FontWeight.Bold)
+      }.type(ButtonType.Capsule)
+      .margin({
+        top: 20
+      })
+      .backgroundColor('#0D9FFB')
+      .onClick(() => {
+        routePage()
+      })
     }
-}
+    .width('100%')
+    .height('100%')
+  }
+}
\ No newline at end of file
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/main/ets/default/pages/index.ets b/frameworks/com.ohos.permissionmanager/entry/src/main/ets/MainAbility/pages/second.ets
similarity index 68%
rename from frameworks/com.ohos.permissionmanager/entry/src/main/ets/default/pages/index.ets
rename to frameworks/com.ohos.permissionmanager/entry/src/main/ets/MainAbility/pages/second.ets
index 5e693e0f5..2a9a10d49 100644
--- a/frameworks/com.ohos.permissionmanager/entry/src/main/ets/default/pages/index.ets
+++ b/frameworks/com.ohos.permissionmanager/entry/src/main/ets/MainAbility/pages/second.ets
@@ -13,16 +13,32 @@
  * limitations under the License.
  */
 
+import router from '@system.router';
+
 @Entry
 @Component
-struct Index {
+struct Second {
+  private content: string = "Second Page"
+
   build() {
     Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
-      Text('Hello World')
+      Text(`${this.content}`)
         .fontSize(50)
         .fontWeight(FontWeight.Bold)
+      Button() {
+        Text('back to index')
+          .fontSize(20)
+          .fontWeight(FontWeight.Bold)
+      }.type(ButtonType.Capsule)
+      .margin({
+        top: 20
+      })
+      .backgroundColor('#0D9FFB')
+      .onClick(() => {
+        router.back()
+      })
     }
     .width('100%')
     .height('100%')
   }
-}
+}
\ No newline at end of file
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/main/java/com/ohos/permissionmanager/MyApplication.java b/frameworks/com.ohos.permissionmanager/entry/src/main/java/com/ohos/permissionmanager/MyApplication.java
deleted file mode 100644
index 6c8f0f649..000000000
--- a/frameworks/com.ohos.permissionmanager/entry/src/main/java/com/ohos/permissionmanager/MyApplication.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.ohos.permissionmanager;
-
-import ohos.aafwk.ability.AbilityPackage;
-
-public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
-}
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/main/resources/base/element/string.json b/frameworks/com.ohos.permissionmanager/entry/src/main/resources/base/element/string.json
index bc3df790e..b93f540e2 100644
--- a/frameworks/com.ohos.permissionmanager/entry/src/main/resources/base/element/string.json
+++ b/frameworks/com.ohos.permissionmanager/entry/src/main/resources/base/element/string.json
@@ -5,7 +5,7 @@
       "value": "entry_MainAbility"
     },
     {
-      "name": "mainability_description",
+      "name": "description_mainability",
       "value": "eTS_Empty Ability"
     }
   ]
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/app.ets b/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/app.ets
deleted file mode 100644
index 03748140d..000000000
--- a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/app.ets
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export default {
-  onCreate() {
-    console.info('Application onCreate')
-  },
-  onShow() {
-    console.info('Application onShow')
-  },
-  onDestroy() {
-    console.info('Application onDestroy')
-  },
-}
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/i18n/en-US.json b/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/i18n/en-US.json
deleted file mode 100644
index 55561b837..000000000
--- a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/i18n/en-US.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "strings": {
-    "hello": "Hello",
-    "world": "World"
-  },
-  "Files": {
-  }
-}
\ No newline at end of file
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/i18n/zh-CN.json b/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/i18n/zh-CN.json
deleted file mode 100644
index cce1af067..000000000
--- a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/i18n/zh-CN.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "strings": {
-    "hello": "您好",
-    "world": "世界"
-  },
-  "Files": {
-  }
-}
\ No newline at end of file
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/pages/index/index.ets b/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/pages/index/index.ets
deleted file mode 100644
index 61dc37aa5..000000000
--- a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/default/pages/index/index.ets
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {Core, ExpectExtend, InstrumentLog} from "deccjsunit/index"
-import testsuite from "../../../test/List.test.ets"
-import featureAbility from "@ohos.ability.featureAbility"
-
-@Entry
-@Component
-struct MyComponent {
-  aboutToAppear() {
-    console.info("start run testcase!!!!")
-    featureAbility.getWant()
-      .then((Want) => {
-        const core = Core.getInstance()
-        const expectExtend = new ExpectExtend({
-          'id': 'extend'
-        })
-        const instrumentLog = new InstrumentLog({
-          'id': 'report', 'unity': 'true'
-        })
-        core.addService('expect', expectExtend)
-        core.addService('report', instrumentLog)
-        core.init()
-        core.subscribeEvent('spec', instrumentLog)
-        core.subscribeEvent('suite', instrumentLog)
-        core.subscribeEvent('task', instrumentLog)
-        const configService = core.getDefaultService('config')
-        configService.setConfig(Want.parameters)
-        testsuite()
-        core.execute()
-        console.info('Operation successful. Data: ' + JSON.stringify(Want));
-      })
-      .catch((error) => {
-        console.error('Operation failed. Cause: ' + JSON.stringify(error));
-      })
-  }
-
-  build() {
-    Flex({
-      direction: FlexDirection.Column,
-      alignItems: ItemAlign.Center,
-      justifyContent: FlexAlign.Center
-    }) {
-      Text('Hello World')
-        .fontSize(50)
-        .fontWeight(FontWeight.Bold)
-    }
-    .width('100%')
-    .height('100%')
-  }
-}
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/test/ExampleJsunit.test.ets b/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/test/ExampleJsunit.test.ets
deleted file mode 100644
index c76c23ebb..000000000
--- a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/test/ExampleJsunit.test.ets
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "deccjsunit/index"
-import app from '@system.app'
-
-export default function exampleJsunit() {
-  describe('appInfoTest', function () {
-    it('app_info_test_001', 0, function () {
-      var info = app.getInfo()
-      expect("1.0").assertEqual('1.0')
-      expect(info.versionCode).assertEqual('3')
-    })
-  })
-}
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/test/List.test.ets b/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/test/List.test.ets
deleted file mode 100644
index 23005224d..000000000
--- a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/ets/test/List.test.ets
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import exampleJsunit from "../test/ExampleJsunit.test.ets"
-
-export default function testsuite() {
-  exampleJsunit()
-}
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/java/com/ohos/permissionmanager/ExampleOhosTest.java b/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/java/com/ohos/permissionmanager/ExampleOhosTest.java
deleted file mode 100644
index e0c56a5cd..000000000
--- a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/java/com/ohos/permissionmanager/ExampleOhosTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.ohos.permissionmanager;
-
-import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class ExampleOhosTest {
-    @Test
-    public void testBundleName() {
-        final String actualBundleName = AbilityDelegatorRegistry.getArguments().getTestBundleName();
-        assertEquals("com.ohos.permissionmanager", actualBundleName);
-    }
-}
\ No newline at end of file
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/resources/base/element/string.json b/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/resources/base/element/string.json
deleted file mode 100644
index 998415d35..000000000
--- a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/resources/base/element/string.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "finalApplication"
-    },
-    {
-      "name": "mainability_description",
-      "value": "hap sample empty page"
-    }
-  ]
-}
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/resources/base/media/icon.png b/frameworks/com.ohos.permissionmanager/entry/src/ohosTest/resources/base/media/icon.png
deleted file mode 100644
index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6790
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

diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/config.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/config.json
index a4a9a97f0..92df3c93f 100644
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/config.json
+++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/config.json
@@ -11,7 +11,8 @@
   "module": {
     "package": "com.ohos.permissionmanager",
     "name": ".MyApplication",
-    "mainAbility": "com.ohos.permissionmanager.GrantAbility",
+    "mainAbility": ".MainAbility",
+    "srcPath": "",
     "deviceType": [
       "phone"
     ],
@@ -24,21 +25,23 @@
     "abilities": [
       {
         "visible": true,
-        "name": "com.ohos.permissionmanager.MainAbility",
-        "description": "$string:mainability_description",
+        "srcPath": "MainAbility",
+        "name": ".MainAbility",
+        "srcLanguage": "ets",
+        "description": "$string:description_mainability",
         "label": "$string:permissionmanager_MainAbility",
         "type": "page",
-        "launchType": "standard",
-        "srcPath": "default"
+        "launchType": "standard"
       },
       {
         "visible": true,
-        "name": "com.ohos.permissionmanager.GrantAbility",
-        "description": "$string:grantability_description",
+        "srcPath": "GrantAbility",
+        "name": ".GrantAbility",
+        "srcLanguage": "ets",
+        "description": "$string:description_grantability",
         "label": "$string:permissionmanager_GrantAbility",
         "type": "page",
-        "launchType": "standard",
-        "srcPath": "dynamic"
+        "launchType": "standard"
       }
     ],
     "js": [
@@ -53,9 +56,10 @@
           "pages/authority-secondary",
           "pages/authority-tertiary",
           "pages/application-tertiary",
-          "pages/other-permissions"
+          "pages/other-permissions",
+          "pages/authority-tertiary-groups"
         ],
-        "name": "default",
+        "name": ".MainAbility",
         "window": {
           "designWidth": 720,
           "autoDesignWidth": false
@@ -69,7 +73,7 @@
         "pages": [
           "pages/dialogPlus"
         ],
-        "name": "dynamic",
+        "name": ".GrantAbility",
         "window": {
           "designWidth": 720,
           "autoDesignWidth": false
@@ -99,4 +103,4 @@
       }
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/frameworks/com.ohos.permissionmanager/entry/src/main/ets/default/app.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/app.ets
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/entry/src/main/ets/default/app.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/app.ets
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/components/dialog.ets
similarity index 75%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/components/dialog.ets
index b5d278319..451678bfa 100644
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/components/dialog.ets
+++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/components/dialog.ets
@@ -21,6 +21,8 @@ import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
 import bundle from '@ohos.bundle'
 import Resmgr from '@ohos.resourceManager'
 
+var TAG = "PermissionManager_GrantAbility"
+
 @Extend(Button) function customizeButton() {
   .backgroundColor($r('app.color.default_background_color'))
   .fontColor($r('app.color.button_color'))
@@ -42,14 +44,14 @@ export struct privacyDialog {
 
   build() {
     Column() {
-      if ((this.initStatus != Constants.INIT_NEED_TO_WAIT) && this.verify(this.reqPerms[this.count])) {
+      if ((this.initStatus != Constants.INIT_NEED_TO_WAIT) && this.verify()) {
         Image(this.grantGroups[this.count].icon)
           .width(Constants.DIALOG_ICON_WIDTH)
           .height(Constants.DIALOG_ICON_HEIGHT)
           .margin({
             top: Constants.DIALOG_ICON_MARGIN_TOP
           })
-        Text(`${this.count + 1} / ${this.reqPerms.length}`)
+        Text(`${this.count + 1} / ${this.grantGroups.length}`)
           .fontSize(Constants.DIALOG_LABEL_FONT_SIZE)
           .fontColor($r('app.color.secondary_font_color'))
           .margin({
@@ -108,39 +110,19 @@ export struct privacyDialog {
     .height(Constants.DIALOG_HEIGHT)
     .width(Constants.DIALOG_WIDTH)
   }
-  async verify(permission) {
+  verify() {
     if((this.initStatus == Constants.INIT_NEED_TO_TERMINATED) || (this.count >= this.grantGroups.length)) {
       this.controller.close()
       this.aboutToDisappear()
       return false
     }
-    if(this.grantGroups[this.count] == 0) {
-      this.result[this.count] = -1
-      this.count ++
-      return false
-    }
-    var acManager = abilityAccessCtrl.createAtManager()
-    var flag = await acManager.getPermissionFlags(this.accessTokenId, permission)
-    console.log("GrantAbility permission: " + permission + " flag : " + flag)
-    if(flag == this.userFixedFlag) {
-      console.log("GrantAbility permission has been fixed:" + permission)
-      var ret = await acManager.verifyAccessToken(this.accessTokenId, permission)
-      if (ret == 0) {
-        this.result[this.count] = 0
-      } else {
-        this.result[this.count] = -1
-      }
-      this.count ++
-      return false
-    }
-    this.result[this.count] = -1
     return true
   }
 
   getApplicationName(uid) {
     bundle.getNameForUid(uid).then((data) => {
-      console.log("GrantAbility getApplicationName bundleName:" + data)
-      console.log("GrantAbility getApplicationName userId:" + Math.floor(uid/200000))
+      console.log(TAG + "GrantAbility getApplicationName bundleName:" + data)
+      console.log(TAG + "GrantAbility getApplicationName userId:" + Math.floor(uid/200000))
       bundle.getApplicationInfo(data, BundleFlag.GET_BUNDLE_DEFAULT, Math.floor(uid/200000)).then(applicationInfo => {
         Resmgr.getResourceManager(data).then(item => {
           item.getString(applicationInfo.labelId, (err, value) => {
@@ -149,47 +131,72 @@ export struct privacyDialog {
             } else {
               this.appName = value
             }
-            console.log("GrantAbility hap label:" + applicationInfo.label + ", value:"+this.appName)
+            console.log(TAG + "GrantAbility hap label:" + applicationInfo.label + ", value:"+this.appName)
           })
         })
       }).catch(err => {
-        console.log("GrantAbility applicationInfo error :" + err)
+        console.log(TAG + "GrantAbility applicationInfo error :" + err)
         this.initStatus = Constants.INIT_NEED_TO_TERMINATED
       })
     }).catch(err => {
-      console.log("GrantAbility getNameForUid error :" + JSON.stringify(err))
+      console.log(TAG + "GrantAbility getNameForUid error :" + JSON.stringify(err))
       this.initStatus = Constants.INIT_NEED_TO_TERMINATED
     })
   }
 
+  getgrantGroups() {
+    var acManager = abilityAccessCtrl.createAtManager()
+    var num =0
+    this.reqPerms.forEach(async (permission, idx) => {
+      var flag = await acManager.getPermissionFlags(this.accessTokenId, permission)
+      if(flag == this.userFixedFlag) {
+        console.log(TAG + "GrantAbility permission has been fixed:" + permission)
+        var ret = await acManager.verifyAccessToken(this.accessTokenId, permission)
+        if(ret == abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED) {
+          this.result[idx] = abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED;
+        }
+      }else {
+        var group = getPermissionGroup(permission)
+        if(!group) {
+          console.log(TAG + "GrantAbility permission not find:" + permission)
+        }else {
+          var exist = this.grantGroups.find(grantGroup => grantGroup.name == group.name)
+          if(!exist) {
+            this.grantGroups.push(group)
+          }
+        }
+      }
+      num ++
+      if(num == this.reqPerms.length) {
+        if(this.grantGroups.length == 0) {
+          this.initStatus = Constants.INIT_NEED_TO_TERMINATED
+        }else {
+          this.initStatus = Constants.INIT_NEED_TO_VERIFY
+        }
+      }
+    })
+  }
+
   aboutToAppear() {
     this.count = 0;
     this.initStatus = Constants.INIT_NEED_TO_WAIT
     this.result = []
     featureAbility.getWant((err, want) => {
       if (err.code != 0) {
-        console.log("GrantAbility featureAbility.getWant err:" + err)
+        console.log(TAG + "GrantAbility featureAbility.getWant err:" + err)
         this.initStatus = Constants.INIT_NEED_TO_TERMINATED
         return
       }
       this.reqPerms = want.parameters['ohos.user.grant.permission']
       this.accessTokenId = want.parameters['ohos.aafwk.param.callerToken']
       if (this.reqPerms == undefined || this.accessTokenId == undefined || this.reqPerms.length == 0) {
-        console.log("GrantAbility invalid parameters")
+        console.log(TAG + "GrantAbility invalid parameters")
         this.initStatus = Constants.INIT_NEED_TO_TERMINATED
         return
       }
-      console.log("GrantAbility request permission=" + JSON.stringify(this.reqPerms) + ", tokenId = " + this.accessTokenId)
-      this.reqPerms.forEach(item => {
-        var group = getPermissionGroup(item)
-        if(!group) {
-          this.grantGroups.push(0)
-          console.log("GrantAbility permission not find:" + item)
-        }else {
-          this.grantGroups.push(group)
-        }
-      })
-      this.initStatus = Constants.INIT_NEED_TO_VERIFY
+      console.log(TAG + "GrantAbility request permission=" + JSON.stringify(this.reqPerms) + ", tokenId = " + this.accessTokenId)
+      this.result = new Array(this.reqPerms.length).fill(-1);
+      this.getgrantGroups();
       this.getApplicationName(want.parameters['ohos.aafwk.param.callerUid'])
     })
   }
@@ -199,7 +206,7 @@ export struct privacyDialog {
     if (this.initStatus == Constants.INIT_NEED_TO_TERMINATED) {
       ret = Constants.RESULT_FAILURE
     }
-    console.log("GrantAbility code:" + ret + ", result=" + JSON.stringify(this.result))
+    console.log(TAG + "GrantAbility code:" + ret + ", result=" + JSON.stringify(this.result))
     featureAbility.terminateSelfWithResult({
       resultCode: ret,
       want: {
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/model/bundle.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/model/bundle.ets
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/model/bundle.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/model/bundle.ets
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/model/permissionGroup.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/model/permissionGroup.ets
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/model/permissionGroup.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/model/permissionGroup.ets
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/utils/constant.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/constant.ets
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/utils/constant.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/constant.ets
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/utils/utils.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/utils.ets
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/common/utils/utils.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/utils.ets
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/pages/dialogPlus.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/pages/dialogPlus.ets
similarity index 55%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/pages/dialogPlus.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/pages/dialogPlus.ets
index bb9996519..cb5c9c93d 100644
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/dynamic/pages/dialogPlus.ets
+++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/pages/dialogPlus.ets
@@ -16,6 +16,8 @@
 import { privacyDialog } from "../common/components/dialog.ets"
 import abilityAccessCtrl from '@ohos.abilityAccessCtrl';
 
+var TAG = "PermissionManager_GrantAbility"
+
 @Entry
 @Component
 struct dialogPlusPage {
@@ -28,49 +30,37 @@ struct dialogPlusPage {
     alignment: DialogAlignment.Center
   })
   async privacyAccept(group, accessTokenId, permissionList, userFixedFlag) {
-    try {
-      var acManager = abilityAccessCtrl.createAtManager()
-      var num = 0
-      group.permissions.forEach(async permission => {
-        console.log("GrantAbility grant permission:" + permission)
-        const result = await acManager.grantUserGrantedPermission(accessTokenId, permission, userFixedFlag)
-        num ++
-        console.log("GrantAbility grant permission result:" + result)
-        var index = permissionList.indexOf(permission)
-        if (index == -1) {
-          console.log("GrantAbility grant permission index err:" + permission)
-        }else {
-          if (result == 0) {
-            this.result[index] = 0
-            console.log("GrantAbility grant permission success:" + permission)
-          } else {
-            console.log("GrantAbility failed to grant permission:" + permission + " ret:" + result)
+    var acManager = abilityAccessCtrl.createAtManager()
+    var num = 0
+    group.permissions.forEach(async permission => {
+      const result = await acManager.grantUserGrantedPermission(accessTokenId, permission, userFixedFlag)
+      num ++
+      console.log(TAG + "GrantAbility grant permission result:" + result + "permission" + permission)
+      if (result == abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED) {
+        permissionList.forEach((req, idx) => {
+          if(req == permission) {
+            this.result[idx] = abilityAccessCtrl.GrantStatus.PERMISSION_GRANTED;
           }
-        }
-        if(num == group.permissions.length) {
-          this.count ++
-        }
-      })
-    }catch {
-      this.count ++
-    }
+        })
+        console.log(TAG + "GrantAbility grant permission success:" + permission)
+      } else {
+        console.log(TAG + "GrantAbility failed to grant permission:" + permission + " ret:" + result)
+      }
+      if(num == group.permissions.length) {
+        this.count ++
+      }
+    })
   }
   async privacyCancel(group, accessTokenId, permissionList, userFixedFlag) {
     var acManager = abilityAccessCtrl.createAtManager()
     group.permissions.forEach(async permission => {
-      console.log("GrantAbility revoke permission:" + permission)
       const result = await acManager.revokeUserGrantedPermission(accessTokenId, permission, userFixedFlag)
-      console.log("GrantAbility revoke permission result:" + result)
-      var index = permissionList.indexOf(permission)
-      if (index != -1 && result == 0) {
-        this.result[index] = -1
-        console.log("GrantAbility revoke permission:" + permission)
-      }
+      console.log(TAG + "GrantAbility revoke permission result:" + result + "permission" + permission);
     })
     this.count ++
   }
   privacyExist() {
-    console.info("exist")
+    console.info(TAG + "exist")
   }
   aboutToAppear() {
     this.privacyDialogController.open()
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/app.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/app.ets
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/app.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/app.ets
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/components/alphabeticalIndex.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/components/alphabeticalIndex.ets
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/components/alphabeticalIndex.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/components/alphabeticalIndex.ets
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/components/backBar.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/components/backBar.ets
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/components/backBar.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/components/backBar.ets
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/components/dialog.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/components/dialog.ets
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/components/dialog.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/components/dialog.ets
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/components/search.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/components/search.ets
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/components/search.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/components/search.ets
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/model/permissionGroup.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/model/permissionGroup.ets
similarity index 97%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/model/permissionGroup.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/model/permissionGroup.ets
index d5a3d0318..77a0fdd33 100644
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/model/permissionGroup.ets
+++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/model/permissionGroup.ets
@@ -193,7 +193,8 @@ export const groups: any[] = [
     "permissions": [
       "ohos.permission.LOCATION_IN_BACKGROUND",
       "ohos.permission.LOCATION"
-    ]
+    ],
+    "isShow":true
   },
   {
     "name": "CAMERA",
@@ -202,7 +203,8 @@ export const groups: any[] = [
     "description": "访问您的相机",
     "permissions": [
       "ohos.permission.CAMERA"
-    ]
+    ],
+    "isShow":true
   },
   {
     "name": "MICROPHONE",
@@ -211,7 +213,8 @@ export const groups: any[] = [
     "description": "访问您的麦克风",
     "permissions": [
       "ohos.permission.MICROPHONE"
-    ]
+    ],
+    "isShow":true
   },
   {
     "name": "PHONE",
@@ -221,7 +224,8 @@ export const groups: any[] = [
     "permissions": [
       "ohos.permission.ANSWER_CALL",
       "ohos.permission.MANAGE_VOICEMAIL"
-    ]
+    ],
+    "isShow":false
   },
   {
     "name": "SMS",
@@ -235,7 +239,8 @@ export const groups: any[] = [
       "ohos.permission.RECEIVE_SMS",
       "ohos.permission.RECEIVE_WAP_MESSAGES",
       "ohos.permission.SEND_MESSAGES"
-    ]
+    ],
+    "isShow":false
   },
   {
     "name": "CONTACTS",
@@ -245,7 +250,8 @@ export const groups: any[] = [
     "permissions": [
       "ohos.permission.READ_CONTACTS",
       "ohos.permission.WRITE_CONTACTS"
-    ]
+    ],
+    "isShow":false
   },
   {
     "name": "CALL_LOG",
@@ -255,7 +261,8 @@ export const groups: any[] = [
     "permissions": [
       "ohos.permission.READ_CALL_LOG",
       "ohos.permission.WRITE_CALL_LOG"
-    ]
+    ],
+    "isShow":false
   },
   {
     "name": "MEDIA",
@@ -266,7 +273,8 @@ export const groups: any[] = [
       "ohos.permission.MEDIA_LOCATION",
       "ohos.permission.READ_MEDIA",
       "ohos.permission.WRITE_MEDIA"
-    ]
+    ],
+    "isShow":true
   },
   {
     "name": "CALENDAR",
@@ -276,7 +284,8 @@ export const groups: any[] = [
     "permissions": [
       "ohos.permission.READ_CALENDAR",
       "ohos.permission.WRITE_CALENDAR"
-    ]
+    ],
+    "isShow":true
   },
   {
     "name": "SPORT",
@@ -285,7 +294,8 @@ export const groups: any[] = [
     "description": "访问您的运动状态",
     "permissions": [
       "ohos.permission.ACTIVITY_MOTION"
-    ]
+    ],
+    "isShow":true
   },
   {
     "name": "HEALTH",
@@ -294,7 +304,8 @@ export const groups: any[] = [
     "description": "访问您的健康数据",
     "permissions": [
       "ohos.permission.READ_HEALTH_DATA"
-    ]
+    ],
+    "isShow":true
   },
   {
     "name": "OTHER",
@@ -303,7 +314,8 @@ export const groups: any[] = [
     "description": "访问您的其它权限",
     "permissions": [
       "ohos.permission.DISTRIBUTED_DATASYNC"
-    ]
+    ],
+    "isShow":false
   }
 ];
 
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/utils/constant.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/utils/constant.ets
similarity index 93%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/utils/constant.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/utils/constant.ets
index bfcd8362c..cd7dceeae 100644
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/utils/constant.ets
+++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/utils/constant.ets
@@ -57,29 +57,30 @@ export default class Constants {
   static TEXTINPUT_IMAGE_MARGIN_TOP = 12;
 
   // grid useSizeType
+  static GRID_MARGIN = '0vp';
   static GUTTER = 0;
-  static LEFT_XS_SPAN = 1;
+  static LEFT_XS_SPAN = 0;
   static LEFT_XS_OFFSET = 0;
-  static LEFT_SM_SPAN = 1;
+  static LEFT_SM_SPAN = 0;
   static LEFT_SM_OFFSET = 0;
-  static LEFT_MD_SPAN = 1;
+  static LEFT_MD_SPAN = 0;
   static LEFT_MD_OFFSET = 0;
   static LEFT_LG_SPAN = 2;
   static LEFT_LG_OFFSET = 0;
-  static MIDDLE_XS_SPAN = 1;
-  static MIDDLE_XS_OFFSET = 1;
-  static MIDDLE_SM_SPAN = 2;
-  static MIDDLE_SM_OFFSET = 1;
-  static MIDDLE_MD_SPAN = 6;
-  static MIDDLE_MD_OFFSET = 1;
+  static MIDDLE_XS_SPAN = 2;
+  static MIDDLE_XS_OFFSET = 0;
+  static MIDDLE_SM_SPAN = 4;
+  static MIDDLE_SM_OFFSET = 0;
+  static MIDDLE_MD_SPAN = 8;
+  static MIDDLE_MD_OFFSET = 0;
   static MIDDLE_LG_SPAN = 8;
   static MIDDLE_LG_OFFSET = 2;
-  static RIGHT_XS_SPAN = 1;
+  static RIGHT_XS_SPAN = 0;
   static RIGHT_XS_OFFSET = 2;
-  static RIGHT_SM_SPAN = 1;
-  static RIGHT_SM_OFFSET = 3;
-  static RIGHT_MD_SPAN = 1;
-  static RIGHT_MD_OFFSET = 7;
+  static RIGHT_SM_SPAN = 0;
+  static RIGHT_SM_OFFSET = 4;
+  static RIGHT_MD_SPAN = 0;
+  static RIGHT_MD_OFFSET = 8;
   static RIGHT_LG_SPAN = 2;
   static RIGHT_LG_OFFSET = 10;
 
@@ -170,6 +171,7 @@ export default class Constants {
   static MANAGEMENT_ROW_PADDING_RIGHT = 12;
   static MANAGEMENT_ROW_PADDING_TOP = 8;
   static MANAGEMENT_ROW_MARGIN_TOP = 12;
+  static MANAGEMENT_TRANSPARENCY = 0.8;
   static APPLICATION_IMAGE_WIDTH = 40;
   static APPLICATION_IMAGE_HEIGHT = 40;
   static APPLICATION_IMAGE_MARGIN_RIGHT = 16;
@@ -197,6 +199,7 @@ export default class Constants {
 
   // setTimeout
   static DELAY_TIME = 1000;
+  static DELAY_TIME_MAX = 2000;
 
   // radio
   static RADIO_ALLOW_NAME = '允许';
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/utils/utils.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/utils/utils.ets
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/common/utils/utils.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/utils/utils.ets
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-secondary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-secondary.ets
similarity index 97%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-secondary.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-secondary.ets
index 0876bbb9b..4ec9944b5 100644
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-secondary.ets
+++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-secondary.ets
@@ -19,6 +19,8 @@ import abilityAccessCtrl from '@ohos.abilityAccessCtrl';
 import { groups } from "../common/model/permissionGroup.ets";
 import Constants from '../common/utils/constant.ets';
 
+var TAG = 'PermissionManager_MainAbility:'
+
 const allowedStatus = 0; // Status: Allowed
 const bannedStatus = 1; // Status: Banned
 class AllowedObj {
@@ -177,7 +179,7 @@ struct appNamePlusPage {
 
   build() {
     Column(){
-      GridContainer({ gutter: Constants.GUTTER }) {
+      GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) {
         Row({}) {
           Row()
             .useSizeType({
@@ -187,7 +189,6 @@ struct appNamePlusPage {
               lg: { span: Constants.LEFT_LG_SPAN, offset: Constants.LEFT_LG_OFFSET }
             })
             .height(Constants.FULL_HEIGHT)
-            .backgroundColor(Color.White)
           Row() {
             Column() {
               Row() {
@@ -285,7 +286,6 @@ struct appNamePlusPage {
                 }
                 .width(Constants.FULL_WIDTH)
                 .height(Constants.FULL_HEIGHT)
-                .backgroundColor($r('app.color.background_color'))
               }
               .layoutWeight(Constants.LAYOUT_WEIGHT)
             }
@@ -305,10 +305,12 @@ struct appNamePlusPage {
               lg: { span: Constants.RIGHT_LG_SPAN, offset: Constants.RIGHT_LG_OFFSET }
             })
             .height(Constants.FULL_HEIGHT)
-            .backgroundColor(Color.White)
         }
         .height(Constants.FULL_HEIGHT)
-      }.backgroundColor(Color.White)
+        .width(Constants.FULL_WIDTH)
+        .backgroundColor($r("sys.color.ohos_id_color_sub_background"))
+        .opacity(Constants.MANAGEMENT_TRANSPARENCY)
+      }
     }
   }
 }
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-tertiary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-tertiary.ets
similarity index 96%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-tertiary.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-tertiary.ets
index b1d7eab8c..8948b2462 100644
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/application-tertiary.ets
+++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-tertiary.ets
@@ -22,6 +22,8 @@ import { authorizeDialog } from "../common/components/dialog.ets";
 import { permissionDescriptions, permissionGroups } from "../common/model/permissionGroup.ets";
 import Constants from '../common/utils/constant.ets';
 
+var TAG = 'PermissionManager_MainAbility:'
+
 let routerData = router.getParams().routerData; // Routing jump data
 let backTitle = router.getParams().backTitle; // return title name
 let status = router.getParams().status; // Status: Allowed, Forbidden
@@ -73,7 +75,7 @@ class MediaListObj {
 struct mediaDocumentPage {
   build() {
     Column() {
-      GridContainer({ gutter: Constants.GUTTER }) {
+      GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) {
         Row() {
           Row()
             .useSizeType({
@@ -83,7 +85,6 @@ struct mediaDocumentPage {
               lg: { span: Constants.LEFT_LG_SPAN, offset: Constants.LEFT_LG_OFFSET }
             })
             .height(Constants.FULL_HEIGHT)
-            .backgroundColor(Color.White)
           Row() {
             Column() {
               Row() {
@@ -116,11 +117,13 @@ struct mediaDocumentPage {
               lg: { span: Constants.RIGHT_LG_SPAN, offset: Constants.RIGHT_LG_OFFSET }
             })
             .height(Constants.FULL_HEIGHT)
-            .backgroundColor(Color.White)
         }
         .height(Constants.FULL_HEIGHT)
+        .width(Constants.FULL_WIDTH)
+        .backgroundColor($r("sys.color.ohos_id_color_sub_background"))
+        .opacity(Constants.MANAGEMENT_TRANSPARENCY)
       }
-    }.backgroundColor(Color.White)
+    }
   }
 }
 
@@ -152,7 +155,7 @@ struct mediaDocumentItem {
       nowGrantResult = result;
     })
     .catch((error) => {
-      console.error('grantUserGrantedPermission failed. Cause: ' + JSON.stringify(error));
+      console.error(TAG + 'grantUserGrantedPermission failed. Cause: ' + JSON.stringify(error));
     })
   }
 
@@ -167,7 +170,7 @@ struct mediaDocumentItem {
       nowRevokeResult = result;
     })
       .catch((error) => {
-        console.error('revokeUserGrantedPermission failed. Cause: ' + JSON.stringify(error));
+        console.error(TAG + 'revokeUserGrantedPermission failed. Cause: ' + JSON.stringify(error));
       })
   }
 
@@ -202,7 +205,7 @@ struct mediaDocumentItem {
         )
       );
     }).catch((error) => {
-      console.error('bundle.getBundleInfo failed. Cause: ' + JSON.stringify(error));
+      console.error(TAG + 'bundle.getBundleInfo failed. Cause: ' + JSON.stringify(error));
       this.mediaListItem = new MediaListObj('', '', '', permissionDescription);
       this.mediaDocListItem.push(
         new MeidaDocObj(Constants.RADIO_ALLOW_NAME, Constants.RADIO_ALLOW_INDEX,
@@ -379,8 +382,7 @@ struct mediaDocumentItem {
       })
       .width(Constants.FULL_WIDTH)
       .height(Constants.FULL_HEIGHT)
-      .backgroundColor($r('app.color.background_color'))
     }
-    .backgroundColor($r('app.color.background_color')).width(Constants.FULL_WIDTH)
+    .width(Constants.FULL_WIDTH)
   }
 }
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-management.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-management.ets
similarity index 89%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-management.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-management.ets
index a1ee72c45..318e24e6a 100644
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-management.ets
+++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-management.ets
@@ -24,6 +24,8 @@ import { permissionGroups, permissionPermissionGroup, permissionGroupIds } from
 import { makePy } from "../common/utils/utils.ets";
 import Constants from '../common/utils/constant.ets';
 
+var TAG = 'PermissionManager_MainAbility:'
+
 @Extend(Image) function customizeImage(width: number, height: number) {
   .objectFit(ImageFit.Contain)
   .width(width)
@@ -50,7 +52,8 @@ interface groupPermission {
   'group': string,
   'permissions': string[],
   'groupName': string,
-  'icon': string
+  'icon': string,
+  'isShow':boolean
 };
 
 let bundleInfosList: any[] = []; // Permission information array
@@ -92,24 +95,22 @@ struct authorityManagementPage {
               uri: 'pages/authority-secondary',
               params: { routerData: this.allPermissionApplications, backTitle: item.groupName }
             })
-          } else {
-            if (item.permissions.length > 1) {
-              router.push({
-                uri: 'pages/authority-secondary',
-                params: { routerData: this.allPermissionApplications, backTitle: item.groupName }
-              })
-            } else {
+          }else if((item.groupName === '电话' || item.groupName === '通讯录' || item.groupName === '信息'
+          || item.groupName === '通话记录' || item.groupName === '日历')){
+            router.push({
+              uri: 'pages/authority-secondary',
+              params: { routerData: this.allPermissionApplications, backTitle: item.groupName }
+            })
+          }else {
+
               var dataList = this.allPermissionApplications.filter((ele) => {
-                return ele.permission === item.permissions[0]
+                return ele.groupName === item.group
               })
-              var tertiaryLabel = permissionGroups.filter((ele) => {
-                return ele.permissionName === item.permissions[0]
-              })[0].label
+
               router.push({
-                uri: 'pages/authority-tertiary',
-                params: { routerData: dataList, backTitle:  tertiaryLabel }
+                uri: 'pages/authority-tertiary-groups',
+                params: { routerData: dataList, backTitle: item.groupName  }
               })
-            }
           }
         })
       }
@@ -168,7 +169,7 @@ struct authorityManagementPage {
       const bundleInfos = res;
       var count = bundleInfos.length;
       if (count <= 0) {
-        console.info('bundle.getAllBundleInfo result.length less than or equal to zero');
+        console.info(TAG + 'bundle.getAllBundleInfo result.length less than or equal to zero');
         return;
       }
       var infoIndex = 0;
@@ -203,7 +204,7 @@ struct authorityManagementPage {
       })
     })
       .catch((error) => {
-        console.error('bundle.getAllBundleInfo failed. Cause: ' + JSON.stringify(error));
+        console.error(TAG + 'bundle.getAllBundleInfo failed. Cause: ' + JSON.stringify(error));
       })
   }
 
@@ -259,22 +260,60 @@ struct authorityManagementPage {
    */
   getAllGroupPermission() {
     const this_ = this;
+    var temp1 = [];
+    temp1 = ["LOCATION","CAMERA","MICROPHONE","MEDIA","CALENDAR","SPORT","HEALTH"];
+    groups.forEach((item) => {
+      if (temp1.indexOf(item.name) > -1) {
+        var gp: groupPermission = {
+          "group": item.name,
+          "permissions": item.permissions,
+          'groupName': item.groupName,
+          'icon': item.icon,
+          'isShow': item.isShow
+        };
+        this_.allGroupPermission.push(gp);
+      }
+    })
+    let temp2 = [];
+    groups.forEach((item) => {
+      if (item.isShow && temp1.indexOf(item.name) === -1) {
+        var gp: groupPermission = {
+          "group": item.name,
+          "permissions": item.permissions,
+          'groupName': item.groupName,
+          'icon': item.icon,
+          'isShow': item.isShow
+        };
+        temp2.push(item.name);
+        this_.allGroupPermission.push(gp);
+      }
+    })
     for (let i = 0; i < this_.allPermissionApplications.length; i++) {
-      if (this_.allGroups.length > 0) {
-        if (this_.allGroups.indexOf(this_.allPermissionApplications[i].groupName) == -1) {
+        if (this_.allGroups.indexOf(this_.allPermissionApplications[i].groupName) == -1
+        && temp1.indexOf(this_.allPermissionApplications[i].groupName) == -1) {
           this_.allGroups.push(this_.allPermissionApplications[i].groupName);
         }
-      } else {
-        this_.allGroups.push(this_.allPermissionApplications[i].groupName);
-      }
     }
+    // Permission layout
+    var temp = this_.allGroups;
+    temp = temp.filter(function(item) {
+      return temp1.indexOf(item) == -1 && temp2.indexOf(item) == -1;
+    });
+    if (temp.indexOf("OTHER") > -1) {
+      temp.splice(temp.indexOf("OTHER"),1);
+      temp.push("OTHER");
+    }else {
+      temp.push("OTHER");
+    }
+    this_.allGroups = temp;
     for (let i = 0; i < this_.allGroups.length; i++) {
       var permissions: string[] = permissionGroupPermissions[this_.allGroups[i]];
       var gp: groupPermission = {
         "group": this_.allGroups[i],
         "permissions": permissions,
         'groupName': '',
-        'icon': ''
+        'icon': '',
+        'isShow': false
       };
       this_.allGroupPermission.push(gp);
     }
@@ -283,6 +322,7 @@ struct authorityManagementPage {
         if (ele.group === item.name) {
           ele.groupName = item.groupName;
           ele.icon = item.icon;
+          ele.isShow = item.isShow;
         }
       });
     })
@@ -349,7 +389,7 @@ struct authorityManagementPage {
         }
       })
     }).catch(error => {
-      console.error('Resmgr.getResourceManager failed. Cause: ' + JSON.stringify(error));
+      console.error(TAG + 'Resmgr.getResourceManager failed. Cause: ' + JSON.stringify(error));
     })
   }
 
@@ -368,7 +408,7 @@ struct authorityManagementPage {
         info['iconId'] = value;
       })
     }).catch(error => {
-      console.error('Resmgr.getResourceManager failed. Cause: ' + JSON.stringify(error));
+      console.error(TAG + 'Resmgr.getResourceManager failed. Cause: ' + JSON.stringify(error));
     })
   }
 
@@ -380,7 +420,7 @@ struct authorityManagementPage {
   }
 
   build() {
-    GridContainer({ gutter: Constants.GUTTER }) {
+    GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) {
       Row() {
         Row()
           .useSizeType({
@@ -423,7 +463,6 @@ struct authorityManagementPage {
                                 })
                               }
                             }.width(Constants.FULL_WIDTH)
-                            .backgroundColor($r('app.color.background_color'))
                           }
                       }.tabBar($r('app.string.authority'))
                       TabContent() {
@@ -433,7 +472,6 @@ struct authorityManagementPage {
                         })
                       }.tabBar($r('app.string.application'))
                     }
-                    .backgroundColor($r('app.color.background_color'))
                     .barWidth(Constants.BAR_WIDTH)
                     .barMode(BarMode.Fixed)
                   }.height(Constants.FULL_HEIGHT)
@@ -460,6 +498,9 @@ struct authorityManagementPage {
           .height(Constants.FULL_HEIGHT)
       }
       .height(Constants.FULL_HEIGHT)
+      .width(Constants.FULL_WIDTH)
+      .backgroundColor($r("sys.color.ohos_id_color_sub_background"))
+      .opacity(Constants.MANAGEMENT_TRANSPARENCY)
     }
   }
 }
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-secondary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-secondary.ets
similarity index 95%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-secondary.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-secondary.ets
index be6785d47..61df8d7fd 100644
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-secondary.ets
+++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-secondary.ets
@@ -18,6 +18,8 @@ import { permissionGroups, groups } from "../common/model/permissionGroup.ets";
 import router from '@system.router';
 import Constants from '../common/utils/constant.ets';
 
+var TAG = 'PermissionManager_MainAbility:'
+
 class CalendarObj {
   permissionName: string
   groupName: string
@@ -39,7 +41,7 @@ struct appNamePage {
   private backTitle = router.getParams().backTitle; // return title name
 
   build() {
-    GridContainer({ gutter: Constants.GUTTER }) {
+    GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) {
       Row() {
         Row()
           .useSizeType({
@@ -80,6 +82,9 @@ struct appNamePage {
           .height(Constants.FULL_HEIGHT)
       }
       .height(Constants.FULL_HEIGHT)
+      .width(Constants.FULL_WIDTH)
+      .backgroundColor($r("sys.color.ohos_id_color_sub_background"))
+      .opacity(Constants.MANAGEMENT_TRANSPARENCY)
     }
   }
 }
@@ -166,7 +171,6 @@ struct appNameItem {
       }
       .width(Constants.FULL_WIDTH)
       .height(Constants.FULL_HEIGHT)
-      .backgroundColor($r('app.color.background_color'))
     }
   }
 }
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-tertiary-groups.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-tertiary-groups.ets
new file mode 100644
index 000000000..b2dfa6ab7
--- /dev/null
+++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-tertiary-groups.ets
@@ -0,0 +1,382 @@
+/*
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { backBar } from "../common/components/backBar.ets";
+import { alphabetIndexerComponent } from "../common/components/alphabeticalIndex.ets";
+import { textInput } from "../common/components/search.ets";
+import router from '@system.router';
+import bundle from "@ohos.bundle";
+import abilityAccessCtrl from '@ohos.abilityAccessCtrl';
+import { getAppLabel, getAppIcon, verifyAccessToken} from "../common/utils/utils";
+import { makePy } from "../common/utils/utils.ets";
+import { authorizeDialog } from "../common/components/dialog.ets";
+import Constants from '../common/utils/constant.ets';
+
+var TAG = 'PermissionManager_MainAbility:'
+
+@Extend(Image) function customizeImage(width: number, height: number) {
+  .objectFit(ImageFit.Contain)
+  .width(width)
+  .height(height)
+}
+
+let routerData = router.getParams().routerData; // Routing jump data
+let backTitle = router.getParams().backTitle; // return title name
+let nowGrantResult = Constants.PERMISSION_NUM; // Authorization results now
+let nowRevokeResult = Constants.PERMISSION_NUM; // Now deauthorize results
+let GrantResultFlag = []; // Authorization result Flag
+let RevokeResultFlag = []; // Cancel authorization result Flag
+
+class ApplicationObj {
+  labelId: string
+  iconId: string
+  index: number
+  accessTokenId: string
+  permission: string
+  alphabeticalIndex: string
+  constructor(
+    labelId: string,
+    iconId: string,
+    index: number,
+    accessTokenId: string,
+    permission: string,
+    alphabeticalIndex: string) {
+    this.labelId = labelId
+    this.iconId = iconId
+    this.index = index
+    this.accessTokenId = accessTokenId
+    this.permission = permission
+    this.alphabeticalIndex = alphabeticalIndex
+  }
+} // application information
+
+@Entry
+@Component
+struct locationInfoPage {
+  build() {
+    GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) {
+      Row() {
+        Row()
+          .useSizeType({
+            xs: { span: Constants.LEFT_XS_SPAN, offset: Constants.LEFT_XS_OFFSET },
+            sm: { span: Constants.LEFT_SM_SPAN, offset: Constants.LEFT_SM_OFFSET },
+            md: { span: Constants.LEFT_MD_SPAN, offset: Constants.LEFT_MD_OFFSET },
+            lg: { span: Constants.LEFT_LG_SPAN, offset: Constants.LEFT_LG_OFFSET }
+          })
+          .height(Constants.FULL_HEIGHT)
+        Row() {
+          Column() {
+            Row() {
+              backBar({ title: JSON.stringify(backTitle) })
+            }
+            Row() {
+              Column() {
+                applicationItem()
+
+              }.width(Constants.FULL_WIDTH)
+            }
+            .layoutWeight(Constants.LAYOUT_WEIGHT)
+          }
+        }
+        .useSizeType({
+          xs: { span: Constants.MIDDLE_XS_SPAN, offset: Constants.MIDDLE_XS_OFFSET },
+          sm: { span: Constants.MIDDLE_SM_SPAN, offset: Constants.MIDDLE_SM_OFFSET },
+          md: { span: Constants.MIDDLE_MD_SPAN, offset: Constants.MIDDLE_MD_OFFSET },
+          lg: { span: Constants.MIDDLE_LG_SPAN, offset: Constants.MIDDLE_LG_OFFSET }
+        })
+        .height(Constants.FULL_HEIGHT)
+        Row()
+          .useSizeType({
+            xs: { span: Constants.RIGHT_XS_SPAN, offset: Constants.RIGHT_XS_OFFSET },
+            sm: { span: Constants.RIGHT_SM_SPAN, offset: Constants.RIGHT_SM_OFFSET },
+            md: { span: Constants.RIGHT_MD_SPAN, offset: Constants.RIGHT_MD_OFFSET },
+            lg: { span: Constants.RIGHT_LG_SPAN, offset: Constants.RIGHT_LG_OFFSET }
+          })
+          .height(Constants.FULL_HEIGHT)
+      }
+      .height(Constants.FULL_HEIGHT)
+      .width(Constants.FULL_WIDTH)
+      .backgroundColor($r("sys.color.ohos_id_color_sub_background"))
+      .opacity(Constants.MANAGEMENT_TRANSPARENCY)
+    }
+  }
+}
+
+@Component
+struct applicationItem {
+  @State permissionNum: number = Constants.PERMISSION_NUM; // permission num
+  @State toggleIsOn: object = {}; // toggle switch state array
+  @State applicationList: ApplicationObj[] = []; // application info array
+  @State oldApplicationItem: ApplicationObj[] = []; // Original application information array
+  @State searchResult: boolean = true; // search results
+
+  authorizeDialogController: CustomDialogController = new CustomDialogController({
+    builder: authorizeDialog({ }),
+    autoCancel: true,
+    alignment: DialogAlignment.Center
+  });
+
+  @Builder ListItemLayout(item, index) {
+    ListItem() {
+      Row() {
+        Column() {
+          Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) {
+            Row() {
+              Image(item.iconId)
+                .customizeImage(Constants.AUTHORITY_IMAGE_WIDTH, Constants.AUTHORITY_IMAGE_HEIGHT)
+                .margin({ right: Constants.AUTHORITY_IMAGE_MARGIN_RIGHT })
+              Text(item.labelId)
+                .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE)
+                .fontColor($r('app.color.text_color'))
+                .flexGrow(Constants.FLEX_GROW)
+              Toggle({ type: ToggleType.Switch, isOn: this.toggleIsOn[item.index] })
+                .selectedColor($r('app.color.toggle_color'))
+                .width(Constants.AUTHORITY_TOGGLE_WIDTH)
+                .height(Constants.AUTHORITY_TOGGLE_HEIGHT)
+                .onChange((isOn: boolean) => {
+                  if (item.accessTokenId === '' || item.permission === '') {
+                    return;
+                  }
+                  let _this = this;
+                  if (isOn) {
+                    let promises = routerData.map(it => new Promise((resolve, reject) => {
+                      _this.grantUserGrantedPermission(item.accessTokenId, it.permission, item.index, resolve);
+                    }));
+                    Promise.all(promises).then(function(results) {
+                      if(results.indexOf(-1) != -1) {
+                        _this.authorizeDialogController.open();
+                        _this.toggleIsOn[item.index] = false;
+                        setTimeout(()=> {
+                          _this.authorizeDialogController.close();
+                        }, Constants.DELAY_TIME)
+                      } else {
+                        _this.toggleIsOn[item.index] = true;
+                      }
+                      let num = Constants.PERMISSION_NUM;
+                      for(let key in _this.toggleIsOn){
+                        if(_this.toggleIsOn[key]){
+                          num++;
+                        }
+                      }
+                      _this.permissionNum = num;
+                    });
+                  } else {
+                    let promises = routerData.map(it => new Promise((resolve, reject) => {
+                      _this.revokeUserGrantedPermission(item.accessTokenId, it.permission, item.index, resolve);
+                    }));
+                    Promise.all(promises).then(function(results) {
+                      if(results.indexOf(-1) != -1) {
+                        _this.authorizeDialogController.open();
+                        _this.toggleIsOn[item.index] = true;
+                        setTimeout(()=> {
+                          _this.authorizeDialogController.close();
+                        }, Constants.DELAY_TIME)
+                      } else {
+                        _this.toggleIsOn[item.index] = false;
+                      }
+                      let num = Constants.PERMISSION_NUM;
+                      for(let key in _this.toggleIsOn){
+                        if(_this.toggleIsOn[key]){
+                          num++;
+                        }
+                      }
+                      _this.permissionNum = num;
+                    });
+                  }
+                })
+            }
+            .width(Constants.FULL_WIDTH)
+            .height(Constants.AUTHORITY_ROW_HEIGHT)
+            .constraintSize({ minHeight: Constants.AUTHORITY_CONSTRAINTSIZE_MINHEIGHT })
+          }
+          if (!index) {
+            Row() {
+              Column()
+                .backgroundColor($r('app.color.text_decoration_color'))
+                .width(Constants.AUTHORITY_TEXT_DECORATION_WIDTH)
+                .height(Constants.TEXT_DECORATION_HEIGHT)
+                .margin({ left: Constants.AUTHORITY_TEXT_DECORATION_MARGIN_LEFT })
+            }
+          }
+        }.onClick(() => {
+        })
+      }
+    }.padding({ left: Constants.LISTITEM_PADDING_LEFT, right: Constants.AUTHORITY_LISTITEM_PADDING_RIGHT })
+  }
+
+  /**
+   * Grant permissions to the app
+   * @param {Number} accessTokenId
+   * @param {String} permission permission name
+   * @param {Number} index Array index to modify permission status
+   */
+  grantUserGrantedPermission(accessTokenId, permission, index, resolve) {
+    abilityAccessCtrl.createAtManager().grantUserGrantedPermission(
+      accessTokenId, permission, Constants.PERMISSION_FLAG).then(result => {
+      // result: 0 Authorization succeeded; result: -1 Authorization failed
+      resolve(result);
+    }).catch(error => {
+      resolve(-1);
+      console.error(TAG + 'abilityAccessCtrl.createAtManager.grantUserGrantedPermission failed. Cause: ' + JSON.stringify(error));
+    })
+  }
+
+  /**
+   * Deauthorize the app
+   * @param {Number} accessTokenId
+   * @param {String} permission permission name
+   * @param {Number} index Array index to modify permission status
+   */
+  revokeUserGrantedPermission(accessTokenId, permission, index, resolve) {
+    abilityAccessCtrl.createAtManager().revokeUserGrantedPermission(
+      accessTokenId, permission, Constants.PERMISSION_FLAG).then(result => {
+      // result: 0 successfully cancel the authorization; result: -1 cancel the authorization failed
+      resolve(result);
+    }).catch(error => {
+      resolve(-1);
+      console.error(TAG + 'abilityAccessCtrl.createAtManager.revokeUserGrantedPermission failed. Cause: ' + JSON.stringify(error));
+    })
+  }
+
+  /**
+   * Lifecycle function, executed when the page is initialized
+   */
+  aboutToAppear() {
+    for (let i = 0; i < routerData[0].bundleNames.length; i++) {
+      // Get BundleInfo based on bundle name
+        bundle.getBundleInfo(routerData[0].bundleNames[i], Constants.PARMETER_BUNDLE_FLAG).then(res => {
+          Promise.all([getAppLabel(res.appInfo.labelId, res.name),
+          getAppIcon(res.appInfo.iconId, res.name),
+          verifyAccessToken(res.appInfo.accessTokenId, routerData[0].permission)
+          ])
+            .then((values) => {
+              this.applicationList.push(
+                new ApplicationObj(
+                String(values[0]),
+                String(values[1]),
+                  i,
+                  res.appInfo.accessTokenId,
+                  routerData[0].permission,
+                makePy(values[0])[0].slice(0, 1)) // Get the first letter in the returned initials array
+              );
+              this.oldApplicationItem.push(
+                new ApplicationObj(
+                String(values[0]),
+                String(values[1]),
+                  i,
+                  res.appInfo.accessTokenId,
+                  routerData[0].permission,
+                makePy(values[0])[0].slice(0, 1)) // Get the first letter in the returned initials array
+              );
+              this.applicationList.sort((a,b) => a.index - b.index)
+              this.oldApplicationItem.sort((a,b) => a.index - b.index)
+            });
+          // 0: have permission; -1: no permission
+          var boole = true;
+          this.permissionNum++;
+          for (let j = 0; j < routerData.length; j++) {
+            verifyAccessToken(res.appInfo.accessTokenId, routerData[j].permission).then((access) => {
+              if (Number(access) === Constants.PERMISSION_INDEX) {
+                if(boole){
+                  this.toggleIsOn[i] = true;
+                }
+              } else {
+                if(boole){
+                  this.permissionNum--
+                }
+                boole = false;
+                this.toggleIsOn[i] = false;
+              }
+            });
+          }
+        }).catch(() => {
+          this.applicationList.push(
+            new ApplicationObj('', '', 0, '', '', '')
+          );
+          this.oldApplicationItem.push(
+            new ApplicationObj('', '', 0, '', '', '')
+          );
+        })
+
+    }
+  }
+
+  build() {
+    Column() {
+      Row() {
+        textInput({
+          placeholder: $r('app.string.textInput_placeholder'),
+          applicationItem: $applicationList,
+          oldApplicationItem: $oldApplicationItem,
+          searchResult: $searchResult
+        })
+      }.padding({
+        left: Constants.AUTHORITY_TEXTINPUT_PADDING_LEFT,
+        right: Constants.AUTHORITY_TEXTINPUT_PADDING_RIGHT
+      })
+      Row() {
+        Flex({ alignItems:ItemAlign.Start, justifyContent: FlexAlign.Start }) {
+          Column() {
+            Flex({ justifyContent: FlexAlign.Start }) {
+              Text(this.permissionNum + '个应用获取此权限')
+                .fontSize(Constants.TEXT_SMAL_FONT_SIZE)
+                .fontColor($r('app.color.secondary_font_color'))
+                .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP, left: Constants.AUTHORITY_TEXT_MARGIN_LEFT })
+            }
+            Scroll() {
+              Row() {
+                Column() {
+                  if (!this.applicationList.length) {
+                    if (this.searchResult) {
+                      Row() {
+                      }.margin({ top: Constants.AUTHORITY_ROW_MARGIN_TOP })
+                    } else {
+                      Row() {
+                        Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
+                          Image($r('app.media.searchnoresult'))
+                            .customizeImage(Constants.SEARCHNORESULT_IMAGE_WIDTH, Constants.SEARCHNORESULT_IMAGE_HEIGHT)
+                        }
+                      }.margin({ top: Constants.AUTHORITY_ROW_MARGIN_TOP })
+                    }
+                  } else {
+                    Row() {
+                      List() {
+                        ForEach(this.applicationList.slice(Constants.SLICE_START, this.applicationList.length - 1),
+                        (item) => {
+                          this.ListItemLayout(item, Constants.SLICE_START_INDEX)
+                        }, item => item.toString())
+                        ForEach(this.applicationList.slice(Constants.SLICE_END), (item, index) => {
+                          this.ListItemLayout(item, Constants.SLICE_END_INDEX)
+                        }, item => item.toString())
+                      }
+                      .backgroundColor($r('app.color.default_background_color'))
+                      .borderRadius(Constants.BORDER_RADIUS)
+                      .padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM })
+                    }.margin({ top: Constants.AUTHORITY_ROW_MARGIN_TOP })
+                  }
+                }.width(Constants.FULL_WIDTH)
+                .height(Constants.AUTHORITY_COLUMN_HEIGHT)
+              }
+            }
+          }.padding({ left: Constants.AUTHORITY_LISTITEM_PADDING_LEFT })
+          Column() {
+            alphabetIndexerComponent({ applicationItem: $applicationList, oldApplicationItem: $oldApplicationItem })
+          }.width(Constants.AUTHORITY_ALPHABETINDEX_WIDTH)
+           .padding({ top: Constants.AUTHORITY_ALPHABETINDEX_PADDING_TOP })
+        }
+      }
+    }
+  }
+}
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-tertiary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-tertiary.ets
similarity index 97%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-tertiary.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-tertiary.ets
index f0ef99c12..2f18b7b92 100644
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/authority-tertiary.ets
+++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-tertiary.ets
@@ -24,6 +24,8 @@ import { makePy } from "../common/utils/utils.ets";
 import { authorizeDialog } from "../common/components/dialog.ets";
 import Constants from '../common/utils/constant.ets';
 
+var TAG = 'PermissionManager_MainAbility:'
+
 @Extend(Image) function customizeImage(width: number, height: number) {
   .objectFit(ImageFit.Contain)
   .width(width)
@@ -59,7 +61,7 @@ class ApplicationObj {
 @Component
 struct locationInfoPage {
   build() {
-    GridContainer({ gutter: Constants.GUTTER }) {
+    GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) {
       Row() {
         Row()
           .useSizeType({
@@ -100,6 +102,9 @@ struct locationInfoPage {
           .height(Constants.FULL_HEIGHT)
       }
       .height(Constants.FULL_HEIGHT)
+      .width(Constants.FULL_WIDTH)
+      .backgroundColor($r("sys.color.ohos_id_color_sub_background"))
+      .opacity(Constants.MANAGEMENT_TRANSPARENCY)
     }
   }
 }
@@ -192,7 +197,7 @@ struct applicationItem {
       }
       this.permissionNum = num;
     }).catch(error => {
-      console.error('abilityAccessCtrl.createAtManager.grantUserGrantedPermission failed. Cause: ' + JSON.stringify(error));
+      console.error(TAG + 'abilityAccessCtrl.createAtManager.grantUserGrantedPermission failed. Cause: ' + JSON.stringify(error));
     })
   }
 
@@ -288,7 +293,6 @@ struct applicationItem {
         left: Constants.AUTHORITY_TEXTINPUT_PADDING_LEFT,
         right: Constants.AUTHORITY_TEXTINPUT_PADDING_RIGHT
       })
-      .backgroundColor($r('app.color.background_color'))
       Row() {
         Flex({ alignItems:ItemAlign.Start, justifyContent: FlexAlign.Start }) {
           Column() {
@@ -331,7 +335,6 @@ struct applicationItem {
                   }
                 }.width(Constants.FULL_WIDTH)
                 .height(Constants.AUTHORITY_COLUMN_HEIGHT)
-                .backgroundColor($r('app.color.background_color'))
               }
             }
           }.padding({ left: Constants.AUTHORITY_LISTITEM_PADDING_LEFT })
@@ -341,7 +344,6 @@ struct applicationItem {
            .padding({ top: Constants.AUTHORITY_ALPHABETINDEX_PADDING_TOP })
         }
       }
-      .backgroundColor($r('app.color.background_color'))
     }
   }
 }
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/other-permissions.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/other-permissions.ets
similarity index 95%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/other-permissions.ets
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/other-permissions.ets
index 8f29466ad..fa6ff1e8a 100644
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/pages/other-permissions.ets
+++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/other-permissions.ets
@@ -18,6 +18,8 @@ import router from '@system.router';
 import Constants from '../common/utils/constant.ets';
 import { otherPermissionsLabel } from '../common/model/permissionGroup.ets'
 
+var TAG = 'PermissionManager_MainAbility:'
+
 let routerData = router.getParams().routerData; // Routing jump data
 let backTitle = router.getParams().backTitle; // return title name
 let status = router.getParams().status; // Status: Allowed, Forbidden
@@ -34,7 +36,7 @@ for (let i = 0; i < permissions.length; i++) {
 @Component
 struct appNamePage {
   build() {
-    GridContainer({ gutter: Constants.GUTTER }) {
+    GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) {
       Row() {
         Row()
           .useSizeType({
@@ -75,6 +77,9 @@ struct appNamePage {
           .height(Constants.FULL_HEIGHT)
       }
       .height(Constants.FULL_HEIGHT)
+      .width(Constants.FULL_WIDTH)
+      .backgroundColor($r("sys.color.ohos_id_color_sub_background"))
+      .opacity(Constants.MANAGEMENT_TRANSPARENCY)
     }
   }
 }
@@ -142,7 +147,6 @@ struct appNameItem {
       }
       .width(Constants.FULL_WIDTH)
       .height(Constants.FULL_HEIGHT)
-      .backgroundColor($r('app.color.background_color'))
     }
   }
 }
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/ar/properties/string.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/ar/properties/string.json
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/ar/properties/string.json
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/ar/properties/string.json
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/dark/properties/string.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/dark/properties/string.json
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/dark/properties/string.json
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/dark/properties/string.json
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/default/media/icon_actived.png b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/default/media/icon_actived.png
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/default/media/icon_actived.png
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/default/media/icon_actived.png
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/default/media/icon_normal.png b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/default/media/icon_normal.png
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/default/media/icon_normal.png
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/default/media/icon_normal.png
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/default/properties/string.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/default/properties/string.json
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/default/properties/string.json
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/default/properties/string.json
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/en/properties/string.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/en/properties/string.json
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/en/properties/string.json
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/en/properties/string.json
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/light/properties/string.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/light/properties/string.json
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/light/properties/string.json
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/light/properties/string.json
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/zh/properties/string.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/zh/properties/string.json
similarity index 100%
rename from frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/default/resources/zh/properties/string.json
rename to frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/resources/zh/properties/string.json
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/java/com/ohos/permissionmanager/MainAbility.java b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/java/com/ohos/permissionmanager/MainAbility.java
deleted file mode 100644
index a9467b0bf..000000000
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/java/com/ohos/permissionmanager/MainAbility.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.ohos.permissionmanager;
-
-import ohos.ace.ability.AceAbility;
-import ohos.aafwk.content.Intent;
-
-public class MainAbility extends AceAbility {
-    @Override
-    public void onStart(Intent intent) {
-        setInstanceName("main_ability");
-        super.onStart(intent);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-}
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/java/com/ohos/permissionmanager/MyApplication.java b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/java/com/ohos/permissionmanager/MyApplication.java
deleted file mode 100644
index 6c8f0f649..000000000
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/java/com/ohos/permissionmanager/MyApplication.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.ohos.permissionmanager;
-
-import ohos.aafwk.ability.AbilityPackage;
-
-public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
-}
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json
index db1d293a5..f505eefa0 100644
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json
+++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json
@@ -5,7 +5,7 @@
       "value": "permissionmanager_MainAbility"
     },
     {
-      "name": "mainability_description",
+      "name": "description_mainability",
       "value": "eTS_Empty Ability"
     },
     {
@@ -81,7 +81,7 @@
       "value": "系统定位服务开关开启时，已允许19个应用获取此设备的位置。"
     },
     {
-      "name": "grantability_description",
+      "name": "description_grantability",
       "value": "eTS_Empty Ability"
     },
     {
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/app.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/app.ets
deleted file mode 100644
index 03748140d..000000000
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/app.ets
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export default {
-  onCreate() {
-    console.info('Application onCreate')
-  },
-  onShow() {
-    console.info('Application onShow')
-  },
-  onDestroy() {
-    console.info('Application onDestroy')
-  },
-}
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/i18n/en-US.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/i18n/en-US.json
deleted file mode 100644
index 55561b837..000000000
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/i18n/en-US.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "strings": {
-    "hello": "Hello",
-    "world": "World"
-  },
-  "Files": {
-  }
-}
\ No newline at end of file
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/i18n/zh-CN.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/i18n/zh-CN.json
deleted file mode 100644
index cce1af067..000000000
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/i18n/zh-CN.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "strings": {
-    "hello": "您好",
-    "world": "世界"
-  },
-  "Files": {
-  }
-}
\ No newline at end of file
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/pages/index/index.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/pages/index/index.ets
deleted file mode 100644
index 61dc37aa5..000000000
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/default/pages/index/index.ets
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {Core, ExpectExtend, InstrumentLog} from "deccjsunit/index"
-import testsuite from "../../../test/List.test.ets"
-import featureAbility from "@ohos.ability.featureAbility"
-
-@Entry
-@Component
-struct MyComponent {
-  aboutToAppear() {
-    console.info("start run testcase!!!!")
-    featureAbility.getWant()
-      .then((Want) => {
-        const core = Core.getInstance()
-        const expectExtend = new ExpectExtend({
-          'id': 'extend'
-        })
-        const instrumentLog = new InstrumentLog({
-          'id': 'report', 'unity': 'true'
-        })
-        core.addService('expect', expectExtend)
-        core.addService('report', instrumentLog)
-        core.init()
-        core.subscribeEvent('spec', instrumentLog)
-        core.subscribeEvent('suite', instrumentLog)
-        core.subscribeEvent('task', instrumentLog)
-        const configService = core.getDefaultService('config')
-        configService.setConfig(Want.parameters)
-        testsuite()
-        core.execute()
-        console.info('Operation successful. Data: ' + JSON.stringify(Want));
-      })
-      .catch((error) => {
-        console.error('Operation failed. Cause: ' + JSON.stringify(error));
-      })
-  }
-
-  build() {
-    Flex({
-      direction: FlexDirection.Column,
-      alignItems: ItemAlign.Center,
-      justifyContent: FlexAlign.Center
-    }) {
-      Text('Hello World')
-        .fontSize(50)
-        .fontWeight(FontWeight.Bold)
-    }
-    .width('100%')
-    .height('100%')
-  }
-}
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/test/ExampleJsunit.test.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/test/ExampleJsunit.test.ets
deleted file mode 100644
index c76c23ebb..000000000
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/test/ExampleJsunit.test.ets
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "deccjsunit/index"
-import app from '@system.app'
-
-export default function exampleJsunit() {
-  describe('appInfoTest', function () {
-    it('app_info_test_001', 0, function () {
-      var info = app.getInfo()
-      expect("1.0").assertEqual('1.0')
-      expect(info.versionCode).assertEqual('3')
-    })
-  })
-}
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/test/List.test.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/test/List.test.ets
deleted file mode 100644
index 23005224d..000000000
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/ets/test/List.test.ets
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import exampleJsunit from "../test/ExampleJsunit.test.ets"
-
-export default function testsuite() {
-  exampleJsunit()
-}
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/java/com/ohos/permissionmanager/ExampleOhosTest.java b/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/java/com/ohos/permissionmanager/ExampleOhosTest.java
deleted file mode 100644
index e0c56a5cd..000000000
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/java/com/ohos/permissionmanager/ExampleOhosTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.ohos.permissionmanager;
-
-import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class ExampleOhosTest {
-    @Test
-    public void testBundleName() {
-        final String actualBundleName = AbilityDelegatorRegistry.getArguments().getTestBundleName();
-        assertEquals("com.ohos.permissionmanager", actualBundleName);
-    }
-}
\ No newline at end of file
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/resources/base/element/string.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/resources/base/element/string.json
deleted file mode 100644
index 0ad161e66..000000000
--- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/resources/base/element/string.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "PermissionManager"
-    },
-    {
-      "name": "mainability_description",
-      "value": "hap sample empty page"
-    }
-  ]
-}
diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/resources/base/media/icon.png b/frameworks/com.ohos.permissionmanager/permissionmanager/src/ohosTest/resources/base/media/icon.png
deleted file mode 100644
index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6790
zcmX|G1ymHk)?T_}Vd;>R?p|tHQo6fg38|$UVM!6BLrPFWk?s;$LOP{GmJpB<l@9sw
zy?6dOXX?(K?>l$qoSA!PUg~PA65-S00{{S`XKG6NkG0RgjEntPrmV+?0|00mu7;+5
zrdpa{2QLqPJ4Y{j7=Mrl{BaxrkdY69+c~(w{Fv-v&aR%aEI&JYSeRTLWm!zbv;?)_
ziZB;fwGbbeL5Q}YLx`J$lp~A09KK8t_z}PZ=4Zzg<l*k=3l5TH`42AmvHedhz{2z&
z6+bsw7KML=Or~18Op0DUFeWj6aXtqjQ9&jNDSjbwK~XUwUM68dAqfFNF#$nwK0zU{
zpd?sWi0OZcMGl`y#>deKtgoc<KeET3EQ^bu9~>+o5EvN9A1K1_<>M?MBqb#!ASf&#
zEX?<)!RH(7>1P+j=jqG(58}TVN-$psA6K}atCuI!KTJD&FMmH-78ZejBm)0qc{ESp
z|LuG1{QnBUJRg_E=h1#XMWt2%fcoN@l7eAS!Es?Q+;XsRNPhiiE=@AqlLkJzF`O18
zbsbSmKN=aaq8k3NF<BRd8kRWK(Sj#TLe+yTeK2Ztx00<htC~$&Jiig$@F-@Y!O%Vd
ziMJ_uX(v5EDQ->YZfDWpKmM!coBU0(XnL8R{4=i|wi{!uWYM2je{U{B*K2PVdu&=E
zTq*-XsEsJ$u5H4g6DIm2Y!DN`>^v|AqlwuCD;w45K0@eqauiqWf7l&o)+YLHm~|L~
z7$0v5mkobriU!H<@mVJHLlmQqzQ3d6Rh_-|%Yy2li*tHO>_vcnuZ7OR_xkAIuIU&x
z-|8Y0wj|6|a6_I(v91y%k_kNw6pnkNdxjqG8!%Vz<oOHLU%R&&way8SyjQ#9W_TXH
z@~f3(Z;B5-*SZw!fNicqIVPUb{dD178)+M^B$YA&H)Ra%M$+lSTb4P_7egEBT(~n7
zfY$(>_d%c_!X+6-;1`GC9_FpjoHev5fEV7RhJ>r=mh-jp$fqbqRJ=obwdgLDVP5+s
zy1=_DWG0Y<H1U(}9Uur;y{#lDQX0ubsH0cX@hY-2D(l(Ha@(XV%(dh#eiZ2ID^0f@
z|G{rt<Rw(rUUS#EeOEwlS)fjF+vLvKO5EJ%iWFeI0+W+AP5q?qxM3m@zMQzZ*B4J-
z;yYGMOd#m~Dn2=^kmboxpF6c+?8|t}n=9-<k++A}Y>-Jb3t^WXmkr(d9~08k-|#Ly
zaNOmT(^9tIb&eb4%Cz<J%OQKb6C!IZy|H=o@xuT1as~LWK94@34effBDqvrdObsc;
z{H_a$T+SB*$dkozcYkS8Q6=TVZquxJ)lM(VCb63sv-_Ld@+mG;0;XLiL=KCcD*?1C
zBV_UcvzyF(57w<VtPQ$cAry~pyY7y<akZGXBFs6K)eX}#WijC!PI8CT3j9)3^m>IT
zAm3CUtWSr1t4?h1kk#NBi{U|pJslvME{q|_eS^3En>SOqSxyuN1x;Is@8~m?*>}**
znrRFArP!K_52RpX*&JHMR<^lVdm8ypJ}0R(SD(51j;6@ni$6bQ+2<eaN!@2w&3<tv
zxx)DrM!Z?N8~Ni+Dnq=mEe(Dxs%lv|fN??}moSU2@7)hZ8jbot2~s(rx)9?uk3y-i
zuZya<W9FkuX|{nmZsS??po%HpUuz|6`y3|T)wxFH9H~e02WP&)rgTt^JOAc@qi=o1
z8jHXL{{&_ot>XL+R^|NnSp5}(kzvMZ^(@4fD_{QVu$(&K6H|C37TG1Am9Re{<<3gd
zh@`>;<BO+#WDd_=JR(==E6|AA=FC<`^v7a~&BpinrFiQ2v`sOd_H!-RH4-oBO3gn#
z=owe8i&)~&JYcNm%MyS0l9}BU%FHu)jybUo$SGkilM~}I`F_!27*ww1HeQwv=bB&^
z%&E>BqkXMW&p0T6rt|iB$)~CvFe(XC)F9WgAZn*0@t$oZo;!*}r@_`h?KKH&6A@3=
zISXoQB+~`op>NP-buiA*^0n{@i{_?MRG)&k)c)k_F+-2Lud!S9pc+i`s74NpBCaGF
zXN+pHkubw*msGBTY27BKHv)RRh3;nMg4&$fD_6X9Vt~;_4D+5XPH~#Kn-yjcy!$}1
zigv#FNY>TqMhtIBb@UoF!cE~Q8~;!Pek>SQQwHnHuWKoVBosAiOr}q>!>aE*Krc)V
zBU<!#gn@$)GG$U4H7}l67!N%jOb7K!uLh_~TwGD=;s+(B;Jbs6q|y^u;!T*zQsEFL
z8aHP3d4r&lUVTQfPbEqhb1=03Tz%SC48-fgJ&reGViPTPnN$^Z#*A^YL??x&1+s+5
z7*vQzs&95A>MEcJ5NU0g8}-h6i1zpMY9>m4ne?=U2~`w7K7Q0gB_=p@$5K7p6}thw
z-~3dMj?YNX2X$lZ+7ngQ$=s}3mizNN@kE%OtB)?c&i~2L55z8^=yz;xMHLmlY>&Q#
zJj?!)M#q_SyfkQh)<tG<C!vOOFP3v(flSj*@l31(`~C$>k?j8IfLtB)ZCp|*vf4_B
zos?73yd^h-Ac+;?E4*bpf=o*^3x3-`TVjbY4n6!EN10K6o@fxdyps05Vo3PU)otB}
z`3k<D^)M4w$2j`haRwFm$_V^VEc_(QRElaPk6W*UmU-GJCI^gqb6;nNBhxM-hdQ{e
za^Xn}oIAB-Rp>R+2w7_C#8Z!q`J)p{Vh!+m9-UP!$STp+Hb}}#@#_u^SsUQg<}59<
zTvH3%XS4G+6FF^(m6bVF&nSUIXcl;nw{=H$%fgeJ>CgDYiLdpDXr{;<d6iS75q15R
z4tUDNF~;uAq-ZGQ78ZP!{j^BLpO4PZn}XNYn3&(9O8%h^JK`&GpnFtB0Ffn->-AnG
z8dvcrHYVMI&`R6;GWekI@Ir3!uo)oz4^{6q0m^}@f2tM9&=YHNi6-?rh0-{+k@cQm
zdp`g#YdQn%MDVg2GR>wZ`n2<0l4)9nx1Wfr&!Dvz=bPwU!h2S?ez6MVc5APE4-xLB
zi&W9Q8k2@0w!C53g?iAIQ}~p*3O(@zja6KQ=M3zfW<x^4%SaY43?hH#PiLG_tF^JK
z{0t9#d}uc9_`6e)4<TLLF5^m+B)`qBW>*_6o5SwR-)6<Xt%?5LXm^jX-vFNDV24gK
z0o(kGXR&yY9wwSez)!zs{%m%>VBh~m7{^-=MC-owY<qq^(2?uaX_%8n)*MerPGDls
z7$X#*1i|~(iS5}V!;nZo*}2y6Wj?N|4D#d@)xxtGXY^y(=k|L?Rc7(?Ejd}vQl)uh
zsvPh0XfLb$r!P?p8f;XBQN}1WPNXu=Y-lm})k1T}xPN6<K=||0S*^)&Om9_(L8=AB
zxJVZc`}9zEop`vE)9#juTKFt>H5-u40a}a0liho3QZZ5L{bS_xM1)4}19)zTU$$MY
zq3eZML1WC{K%YFd`Be0M-rkO^l?h{kM{$2oK1*A@HVJ57*yhDkUF!2WZ&oA4Y-sK(
zCY69%#`mBCi6>6uw(x4gbFaP0+FD*JKJ-q!F1E?vLJ+d35!I5<gynnW3MP8+8K~rY
zv2`e+vKy;qJ&4nI#9*$cd12}vt#?!keuIwt3fjX@zF(Uz2mClQ)hOV4$Y4c_B_ho1
zm1oc^VI``dP)pSS&zpGWZ(Ibb3-ErkUVAP2<>d7@^eU?(CS|C^tmI5?lv@s{{*|1F
zFg|OzNpZ0hxljdjaW%45O0MOttRrd(Z?h{HYbB-KFUx&9GfFL3b8NwZ$zNu)WbBD`
zYkj$^UB5%3Pj1MDr>S2Ejr9pUcgA!;ZG!@{uAy12)vG=*^9-|dNQBc8&`oxBlU~#y
zs!anJX&T?57Jdr^sb>e+V`MVfY>Y0ESg7MG<7W0g&b<n0cn89*zNC$?UHuR+SaROb
zz!dXC3`!#Z6r*Os)=c?sm8}?sk+oJ4^EzCXYvMzQPIGlVpDY)>R-ZYzzZ%2H&Etcp
zcd6QeXO1D!5A#zM0lx*GH}`M)2~ZFLE;sP^RSB5wVMNfiZXPd(cmO>j=OSA3`o5r&
zna(|^jGXbdN7PK)U8b7^zYtYkkeb%<%F~=OqB~kXMQkq}ii|skh@WSRt>5za;cjP0
zZ~nD%6)wzedqE}BMLt~qKwlvTr33))#uP~xyw#*Eaa|DbMQ_%mG0U8numf8)0DX`r
zRoG2bM;#g|p-8gWnwRV5SCW0<MIN&m@jT=O@?*@xEt?t*sVVe)3L192SZ50k^P7-l
z6CWsg@A6Iky6>tLjLO&9Z?K>FImeIxlGUgo0Zk`9Qzhj1eco~7XZy+hXc@YF&ZQ=?
zn*^1O56yK^x{y}q`j7}blGCx%dydV!c7)g~tJzmHhV=W~jbWRRR{1<^oDK+1clprm
zz$eCy7y9+?{E|YgkW~}}iB#I4XoJ*xr8R?i_Hv$=Cof5bo-Nj~f`-DLebH}&0%<w>
zfQj9@WGd4;N~Y?mzQsHJTJq6!Qzl^-vwol(+fMt#Pl=Wh#lI5Vmu@QM0=_r+1wHt`
z+8WZ~c2}KQQ+q)~2Ki77QvV&`xb|xVcTms99&cD$Zz4+-^R4kv<ZfOdz4K`A`{Qe*
z-JKk1pT%U%lnr){fDl(UO-m1&*8}iK9(M>UBxG8gDk7Y`K*)JZ^2rL(+ZWV~%W(@6
z)0bPArG#BROa_PHs~&WplQ_UIrpd)1N1QGPfv!J(Z9jNT#i%H?CE6|pPZb9hJ1JW4
z^q;ft#!HRNV0YgPojzIYT`8LuET2rUe-J|c!9l4`^*<Z|YDpLltjtU!PJjF;C!CYZ
zWC7ibOt{(XeA%<z77_G)T4jaqMwP|IlcQo{o1%Z)k9)xoyZAbLxk0u565<)eYMdJX
zIUZFgj~LUAN-5ahq#JOF2h#KRMtQo_$%r=-6nO?VBeomPay-ZcpOH%|vL%%5AH@<`
z*bPOb9OKY)($s`e^xefy=j~nX`bjzhut*+&;EvIwrM>;4WtY@Ew@pL>wkjmMgGfN7
ze}}GtmU0@<_#08~I-Suk=^*9GLW=H4xhsml;vAV{%hy5Eegl@!6qKqbG024%n2HHw
zCc@ivW_$@5ZoHP70(7D+(`PvgjW1Pd`wsiuv-aCukMrafwDm)B!xXVy*j2opohhoU
zcJz%ADmj>i3`-3-$7nQKBQQuGY;2Qt&+(L~C>vSGFj5{Mlv?T_^dql;{zkpe4R1}R
z%XfZyQ}wr*sr>jrKgm*PWLjuVc%6&&`Kbf1SuFpHPN&>W)$GmqC;pIoBC`=4-hPY8
zT*>%I2fP}vGW;R=^!1be?ta2UQd2>alOFFbVl;(SQJ4Jk#)4Z0^wpWEVvY4=vyDk@
zqlModi@iVPMC+{?rm=4(n+<;|lmUO@UKYA>EPTS~AndtK<tI;dw<^Iycw`3JP!KOa
zA#?T7@~19~`G83zbu|@Omg9&IKlf?d0R`=(;5XFQ!3Hg|32Lm17=Iq;^#3+HO$#m2
zo$JpZ?PvSsZ<kmJAD%h$>^Wy^%#3<;(dQdk3WaUkRtzSMC9}7x2||CNpF#(3T4C)@
z$~RWs`BNABKX|{cmBt>Q=&gkXl&x!!NK_%5hW0LS)Z4PB>%sV?F-{Wyj#s7W%$F{D
zXdK^Fp3wvy+48+GP6F_|^PCRx=ddcTO3sG;B23A49~Qaw31SZ0Rc~`r4qqt%#OGW{
zCA_(LG5^N>yzUn&kAgVmxb=EA8s&tBXC}S1CZ(KoW)(%^JjLTPo^f<CK6lYfd+bR2
zg|1KuDjlI^y;JhdkX;{@h3U)}FMW{8Wf?^Z6_7Qic@lR{bl&DrjWVh2{nHsmI2?pQ
zwO!~?V)HX9@mx+XZTH#v^u|UViXew%`GN!XArWBIH`mDOs$sP|nz<2F#GK(~KoWn%
zkGvk+e7;>s`Va;`=YlVPgmB$!yB}<(4ym6OeZ3xAJJ#;)2+B%p3P1Wt+d$eo`vz`T
zXfUP2))kB<I*uvu9cHdC=BV@NjYWQSsu=OH-#%Nedma@qUGehq8i*B?CJ||LZ75iR
zd*tSGoVSP>DPoscH;Jc7I3NU<({|@wM$&GaDt`n7WLgIY3IA7A6-_R?z8N3mz|}*i
z(zl5ot--Oq@f2-nv{X(ujT2T(k1vY_qh93pK@>H-qc%2Xta)<b?`t{Q+kJ8~DyWvN
zwq=fIfIW(*k8M1~^Eym4E_&-+E`M-BZc=pWLwlfZ*8)e-ZgFxM^q@Xq69Cf69{NGR
zQV?WB@&YVsMs_S(yD>IP0Q%zt%bqYgI`o!wv!0QerB`nCN^1n|@$sVOQ!V0teVG!I
z_fD<S2k#)y@|;YZk30`^smpTTy{8gyR@^rnIoRI-lWEFnVp<<WQe7h8{?21+fkxn}
zHYp6FTgy<3c;r%Vd~?OcZ$s7BC)WMd!QrNB2jp0cbT*T4ZHC3j)ef6e%}|wiYs2@Y
zi=sh$uICxwOJosLfzEc~T^<S~BuCn*!YE`OI~Znr8|6M>%JvfDeT1cK#-{o6Gv7}&
zY0#NWin~kVaf$aufV&;63Hbs|`QVZWpDX6IMk1Hj2G}fiH9e-^6u2<NCbh!l-p$0y
zAJx1?Z#{~#F-&)j>zf^FIr^BwD<6zjw63+{yUe8PUFvk8v{sJ=R{d#`O!sz`Q13~<
zPT$JS(w=yQfU2`zPCNfSw=&zup@DXc(98afjhv@1w_f!m2Z>rMJ19AB&dB%P#Ls3b
z=lK7OILM+SQ&VEd=1GN6o&>YVVtIzoZ%=Z_SdqJN2}E43{bE`>w+A;=y->@^k{oCC
z$F*WTY&?34;kfyFV?b*Xb1Pq`Z=%OgwEg)Rz)tx=`f%5#w_INP=x&z5!jI;#;N$ma
zhO)+MDm;SxOE<Tua5@xx<I0nU`)cm#)ler2UjJMJN^WMk&x3T1u-ft^sq}U>VL15;
zGq(v2pL3&P1Sl)8P*;G-fd{l1QJsv@e@<ea$h>d8)<Eb39&UxZuC=cYFe0(Oir|@)
z7>1PK4w2m*M%V3j-V~L^$i|&C@b?D?9tfwE{B^}Z$k8e5FmQ>v7Xz)sG32g9t}YBt
zyR$+*_00RmPx<p=t!Vr{atkr5n~<LI4f_R}F+I-?gzTbz$ik1UO+zb*rzD-bzXibC
zw5HS}1_*GlQhrk0`Q>+0mW+vVG4mxd(n$(eQf3-w>JPl2UJpafrPaL5@2j}%{VE-)
zBI%6Q<?t*`Ti_KB*5|*dWJo{%nSsr^h}b4Awq95zh;;Dh#Dui%A79&vNCHa2W!xr0
zFTeh(f+5yWtk3}GGhy2K?SaiUBO|x8x_LqF98^M~?>pj*dsdH<;g!S!avA~bv^0E+
zfyJbSjPb+j;J52U)<|cIcntQBI2T#>2;tOxu{%D?kML476AErF(qN9hPva5Nkc@BF
zC-tLF@3ZFb%Kpj)M<{)x*l|*Ia@ECeXo2E4h2f!aV=cHAhi_E_mfUth(sM4^hJq7B
zQsGWqdZUm9<F@QAL<auuI{a}95*NzTPa<>S%F`$nQ*_#NcuD`&)Ek%_s{&^78{9Hm
z<ENtAmFhHY#bOE@!rC;sMMQ5hh*aicA%06FJw;v;%Xyd8uWpvUz1dVl3c`BhGc06w
zchFl-+yny+l;O`T1g7Yp7cXWw#hsy=7RZQNww4!tzF0zg**VUC?<2de#i<#qz#rA9
z@mijY=XrAtgMn`51n$9n$Zs@^1&hYTV~sBIh7N@c3Y|*7M?Xk_qPxd+t-Ob((LUhh
zQ2#EB(MU?;0al({A7ZDQumNkCC50)AxC#KI^vqjgcz%E>tri&rYLOxgFdG>O@+XHy
z9#;|&vBCPXH5Mon^I`jSuR$&~ZWtyB67ujzFSj!51>#C}C17~TffQ{c-!QFQkTQ%!
zIR^b1`zHx|*1GU?tbBx23weFLz5H?y_<eHx#Bm1i8c5U5H`HCEPJyN5fpsa;v42Nh
zGFFdynRK;sBjCb2iZR^+uPrXpvPS~Bh}IAbd8$ss8H+AYHeyc-Wk6rr)A$n`FT)uR
zt<_77<RQx&`x6_Cn^!?Kh})0(U0+w}pgNiSL>Q%N&t$}k?w+``2A=aotj0;2v$~AL
z{scF-cL{wsdrmPvf#a9OHyYLcwQD4Kcm)`LLwMh4WT~p29f7M!iafJSU`IV}QY5Wa
z(n44-9oA}?J{a+ah*@31WTs#&J#o1`H98#6IQf;Wv0N_!);f&9g7o-k(lW5rWnDUR
zQBFIRG+X=6NnsI@mxnwm;tf5;_Uxg?jZ8m-m0}&6+DA!qam(p$mN5R})yA_7m$q@|
zFEd|dpS595rxQr-n#GjI5i-AhnUE>Cr;jpCq<NG2-WoxlOPbfntZd`cG-kgX_H&`E
zuk%ukIk14p{qK*fLz}vWOpIR?Cr;wWVd!|iw2F^$-Py&P3PO<cb(1)5fWITzL`2hW
zxb?{>SrD~EwK_DqI^7%3#p5)%T_od!t3SOmH9MyXeeGO2(UQL;ax|x?Ncixmeo1=$
z{-);Au{*tfzOG?KQ~K|ak8-HQ?`Pekhe2WM(8s{xv-p>Zmu_6{G!-<tEu278X#CQp
zQruTl^@@A;@99wA_Le>oE$7$mY`MOJorI=+mMx?H;`pr!;fVYz?5~yXBACruWB`Ph
zZM}90_<^OBxIhyZ9BW$`>6JvO;%VFpqVr8|7t3~AmxYak6?`Pp#c;**_SYmi`&z23
z`p6_~ePvH)C6x-G9$hgL=eVALq`-AiamN>!3~Lxw&{H(b{B(7xSRm6<3<{%{yXiH#
zos5Rv1L+8fUKJL<k~a{}KP^0ew-EVGKm73>o%P>4I&$}y<EG|7-flk7U1byCfol%r
zRq(+_wBzmq8c82N1TcaziET^jKK$H5cV$r;;CGKDIb+^eoOy*3L`cMt;?yr;9jVNq
g9jT&p2BIGx8p5me=?Fj;|Gtl&DQhd$Ky4BK2beUY8~^|S

-- 
Gitee


From dc044a503a553c8f7df4b10a5edb3097eb6e733b Mon Sep 17 00:00:00 2001
From: l00520400 <linshuqing2@huawei.com>
Date: Thu, 3 Mar 2022 16:48:49 +0800
Subject: [PATCH 3/5] code review

Signed-off-by: l00520400 <linshuqing2@huawei.com>
Change-Id: I182cb5e9c8e57598c53c93ceea164bd73bc4a35b
Signed-off-by: l00520400 <linshuqing2@huawei.com>
---
 .../innerkits/nativetoken/src/nativetoken.c   | 135 +++++++++---------
 1 file changed, 70 insertions(+), 65 deletions(-)

diff --git a/interfaces/innerkits/nativetoken/src/nativetoken.c b/interfaces/innerkits/nativetoken/src/nativetoken.c
index 662ba98c1..8a5c12017 100644
--- a/interfaces/innerkits/nativetoken/src/nativetoken.c
+++ b/interfaces/innerkits/nativetoken/src/nativetoken.c
@@ -38,7 +38,7 @@ int32_t GetFileBuff(const char *cfg, char **retBuff)
         return ATRET_FAILED;
     }
 
-    if ((fileStat.st_size < 0) || (fileStat.st_size > MAX_JSON_FILE_LEN)) {
+    if (fileStat.st_size > MAX_JSON_FILE_LEN) {
         ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:stat file size is invalid.", __func__);
         return ATRET_FAILED;
     }
@@ -71,7 +71,7 @@ int32_t GetFileBuff(const char *cfg, char **retBuff)
     return ATRET_SUCCESS;
 }
 
-void FreeDcaps(char *dcaps[MAX_DCAPS_NUM], int32_t num)
+static void FreeDcaps(char *dcaps[MAX_DCAPS_NUM], int32_t num)
 {
     for (int32_t i = 0; i <= num; i++) {
         if (dcaps[i] != NULL) {
@@ -81,7 +81,7 @@ void FreeDcaps(char *dcaps[MAX_DCAPS_NUM], int32_t num)
     }
 }
 
-uint32_t GetprocessNameFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
+static uint32_t GetprocessNameFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
 {
     cJSON *processNameJson = cJSON_GetObjectItem(cjsonItem, PROCESS_KEY_NAME);
     if (!cJSON_IsString(processNameJson) || (strlen(processNameJson->valuestring) > MAX_PROCESS_NAME_LEN)) {
@@ -96,18 +96,25 @@ uint32_t GetprocessNameFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
     return ATRET_SUCCESS;
 }
 
-uint32_t GetTokenIdFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
+static uint32_t GetTokenIdFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
 {
     cJSON *tokenIdJson = cJSON_GetObjectItem(cjsonItem, TOKENID_KEY_NAME);
     if ((!cJSON_IsNumber(tokenIdJson)) || (cJSON_GetNumberValue(tokenIdJson) <= 0)) {
         ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:tokenIdJson is invalid.", __func__);
         return ATRET_FAILED;
     }
+
+    AtInnerInfo *atIdInfo = (AtInnerInfo *)&(tokenIdJson->valueint);
+    if (atIdInfo->type != TOKEN_NATIVE_TYPE) {
+        ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:tokenId type is invalid.", __func__);
+        return ATRET_FAILED;
+    }
+
     tokenNode->tokenId = (NativeAtId)tokenIdJson->valueint;
     return ATRET_SUCCESS;
 }
 
-uint32_t GetAplFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
+static uint32_t GetAplFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
 {
     cJSON *aplJson = cJSON_GetObjectItem(cjsonItem, APL_KEY_NAME);
     if (!cJSON_IsNumber(aplJson)) {
@@ -123,20 +130,24 @@ uint32_t GetAplFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
     return ATRET_SUCCESS;
 }
 
-uint32_t GetDcapsInfoFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
+static uint32_t GetDcapsInfoFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
 {
     cJSON *dcapsJson = cJSON_GetObjectItem(cjsonItem, DCAPS_KEY_NAME);
     int32_t dcapSize = cJSON_GetArraySize(dcapsJson);
 
     tokenNode->dcapsNum = dcapSize;
+    if (dcapSize > MAX_DCAPS_NUM) {
+        ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:dcapSize = %d is invalid.", __func__, dcapSize);
+        return ATRET_FAILED;
+    }
     for (int32_t i = 0; i < dcapSize; i++) {
         cJSON *dcapItem = cJSON_GetArrayItem(dcapsJson, i);
-        if (dcapItem == NULL) {
+        if (dcapItem == NULL || !cJSON_IsString(dcapItem) || dcapItem->valuestring == NULL) {
             ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:cJSON_GetArrayItem failed.", __func__);
             return ATRET_FAILED;
         }
         size_t length = strlen(dcapItem->valuestring);
-        if (!cJSON_IsString(dcapItem) || (length > MAX_DCAP_LEN)) {
+        if (length > MAX_DCAP_LEN) {
             ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:dcapItem is invalid.", __func__);
             return ATRET_FAILED;
         }
@@ -155,7 +166,7 @@ uint32_t GetDcapsInfoFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
     return ATRET_SUCCESS;
 }
 
-int32_t GetTokenList(const cJSON *object)
+static int32_t GetTokenList(const cJSON *object)
 {
     int32_t arraySize;
     int32_t i;
@@ -194,16 +205,13 @@ int32_t GetTokenList(const cJSON *object)
     return ATRET_SUCCESS;
 }
 
-int32_t ParseTokenInfo(const char *filename)
+static int32_t ParseTokenInfo(void)
 {
     char *fileBuff = NULL;
     cJSON *record = NULL;
     int32_t ret;
 
-    if (filename == NULL || filename[0] == '\0') {
-        return ATRET_FAILED;
-    }
-    ret = GetFileBuff(filename, &fileBuff);
+    ret = GetFileBuff(TOKEN_ID_CFG_FILE_PATH, &fileBuff);
     if (ret != ATRET_SUCCESS) {
         return ret;
     }
@@ -220,7 +228,30 @@ int32_t ParseTokenInfo(const char *filename)
     return ret;
 }
 
-int32_t AtlibInit(void)
+static int32_t CreateCfgFile(void)
+{
+    int32_t fd = open(TOKEN_ID_CFG_FILE_PATH, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP);
+    if (fd < 0) {
+        ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:open failed.", __func__);
+        return ATRET_FAILED;
+    }
+    close(fd);
+
+    struct stat buf;
+    if (stat(TOKEN_ID_CFG_DIR_PATH, &buf) != 0) {
+        ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:stat folder path is invalid %d.",
+                              __func__, errno);
+        return ATRET_FAILED;
+    }
+    if (chown(TOKEN_ID_CFG_FILE_PATH, buf.st_uid, buf.st_gid) != 0) {
+        ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:chown failed, errno is %d.", __func__, errno);
+        return ATRET_FAILED;
+    }
+
+    return ATRET_SUCCESS;
+}
+
+static int32_t AtlibInit(void)
 {
     g_tokenListHead = (NativeTokenList *)malloc(sizeof(NativeTokenList));
     if (g_tokenListHead == NULL) {
@@ -229,18 +260,24 @@ int32_t AtlibInit(void)
     }
     g_tokenListHead->next = NULL;
 
-    int32_t ret = ParseTokenInfo(TOKEN_ID_CFG_FILE_PATH);
+    int32_t ret = ParseTokenInfo();
     if (ret != ATRET_SUCCESS) {
         free(g_tokenListHead);
         g_tokenListHead = NULL;
         return ret;
     }
+
+    if (g_tokenListHead->next == NULL) {
+        if (CreateCfgFile() != ATRET_SUCCESS) {
+            return ATRET_FAILED;
+        }
+    }
     g_isNativeTokenInited = 1;
 
     return ATRET_SUCCESS;
 }
 
-int GetRandomTokenId(uint32_t *randNum)
+static int GetRandomTokenId(uint32_t *randNum)
 {
     uint32_t random;
     int len;
@@ -271,7 +308,7 @@ static int32_t IsTokenUniqueIdExist(uint32_t tokenUniqueId)
     return 0;
 }
 
-NativeAtId CreateNativeTokenId(void)
+static NativeAtId CreateNativeTokenId(void)
 {
     uint32_t rand;
     NativeAtId tokenId;
@@ -301,7 +338,7 @@ NativeAtId CreateNativeTokenId(void)
     return tokenId;
 }
 
-int32_t GetAplLevel(const char *aplStr)
+static int32_t GetAplLevel(const char *aplStr)
 {
     if (aplStr == NULL) {
         return 0;
@@ -318,31 +355,8 @@ int32_t GetAplLevel(const char *aplStr)
     ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:aplStr is invalid.", __func__);
     return 0;
 }
-int32_t NeedSetUidGid(int16_t *uid, int16_t *gid, int *needSet)
-{
-    struct stat buf;
-    if (stat(TOKEN_ID_CFG_FILE_PATH, &buf) == 0) {
-        *needSet = 0;
-        return ATRET_SUCCESS;
-    }
-    if (errno != ENOENT) {
-        ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:stat file path is invalid %d.",
-                              __func__, errno);
-        return ATRET_FAILED;
-    }
-    if (stat(TOKEN_ID_CFG_DIR_PATH, &buf) != 0) {
-        ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:stat folder path is invalid %d.",
-                              __func__, errno);
-        return ATRET_FAILED;
-    }
-    *uid = buf.st_uid;
-    *gid = buf.st_gid;
-    *needSet = 1;
-    ACCESSTOKEN_LOG_INFO("[ATLIB-%s]:needSet is true.", __func__);
-    return ATRET_SUCCESS;
-}
 
-void WriteToFile(const cJSON *root)
+static void WriteToFile(const cJSON *root)
 {
     int32_t strLen;
     int32_t writtenLen;
@@ -355,12 +369,6 @@ void WriteToFile(const cJSON *root)
     }
 
     do {
-        int16_t uid;
-        int16_t gid;
-        int needSet = 0;
-        if (NeedSetUidGid(&uid, &gid, &needSet) != ATRET_SUCCESS) {
-            break;
-        }
         int32_t fd = open(TOKEN_ID_CFG_FILE_PATH, O_RDWR | O_CREAT | O_TRUNC,
                           S_IRUSR | S_IWUSR | S_IRGRP);
         if (fd < 0) {
@@ -374,17 +382,13 @@ void WriteToFile(const cJSON *root)
             ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:write failed, writtenLen is %d.", __func__, writtenLen);
             break;
         }
-        if ((needSet == 1) && chown(TOKEN_ID_CFG_FILE_PATH, uid, gid) != 0) {
-            ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:chown failed, errno is %d.", __func__, errno);
-            break;
-        }
     } while (0);
 
     cJSON_free(jsonStr);
     return;
 }
 
-int32_t AddDcapsArray(cJSON *object, const NativeTokenList *curr)
+static int32_t AddDcapsArray(cJSON *object, const NativeTokenList *curr)
 {
     cJSON *dcapsArr = cJSON_CreateArray();
     if (dcapsArr == NULL) {
@@ -461,7 +465,7 @@ static cJSON *CreateNativeTokenJsonObject(const NativeTokenList *curr)
     return object;
 }
  
-void SaveTokenIdToCfg(const NativeTokenList *curr)
+static void SaveTokenIdToCfg(const NativeTokenList *curr)
 {
     char *fileBuff = NULL;
     cJSON *record = NULL;
@@ -498,8 +502,8 @@ void SaveTokenIdToCfg(const NativeTokenList *curr)
     return;
 }
 
-uint32_t CheckProcessInfo(const char *processname, const char **dcaps,
-                          int32_t dcapNum, const char *aplStr, int32_t *aplRet)
+static uint32_t CheckProcessInfo(const char *processname, const char **dcaps,
+                                 int32_t dcapNum, const char *aplStr, int32_t *aplRet)
 {
     if ((processname == NULL) || strlen(processname) > MAX_PROCESS_NAME_LEN
         || strlen(processname) == 0) {
@@ -512,7 +516,7 @@ uint32_t CheckProcessInfo(const char *processname, const char **dcaps,
         return ATRET_FAILED;
     }
     for (int32_t i = 0; i < dcapNum; i++) {
-        if (strlen(dcaps[i]) > MAX_DCAP_LEN) {
+        if ((dcaps[i] == NULL) || (strlen(dcaps[i]) > MAX_DCAP_LEN)) {
             ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:dcap length is invalid.", __func__);
             return ATRET_FAILED;
         }
@@ -553,7 +557,7 @@ static uint32_t AddNewTokenToListAndCfgFile(const char *processname, const char
 
     for (int32_t i = 0; i < dcapNumIn; i++) {
         tokenNode->dcaps[i] = (char *)malloc(sizeof(char) * (strlen(dcapsIn[i]) + 1));
-        if (tokenNode->dcaps[i] != NULL &&
+        if (tokenNode->dcaps[i] == NULL ||
             (strcpy_s(tokenNode->dcaps[i], strlen(dcapsIn[i]) + 1, dcapsIn[i]) != EOK)) {
             ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:copy dcapsIn[%d] failed.", __func__, i);
             FreeDcaps(tokenNode->dcaps, i);
@@ -570,7 +574,7 @@ static uint32_t AddNewTokenToListAndCfgFile(const char *processname, const char
     return ATRET_SUCCESS;
 }
 
-int32_t CompareProcessInfo(NativeTokenList *tokenNode, const char **dcapsIn, int32_t dcapNumIn, int32_t aplIn)
+static int32_t CompareProcessInfo(NativeTokenList *tokenNode, const char **dcapsIn, int32_t dcapNumIn, int32_t aplIn)
 {
     if (tokenNode->apl != aplIn) {
         return 1;
@@ -586,7 +590,8 @@ int32_t CompareProcessInfo(NativeTokenList *tokenNode, const char **dcapsIn, int
     return 0;
 }
 
-uint32_t UpdateTokenInfoInList(NativeTokenList *tokenNode, const char **dcapsIn, int32_t dcapNumIn, int32_t aplIn)
+static uint32_t UpdateTokenInfoInList(NativeTokenList *tokenNode,
+    const char **dcapsIn, int32_t dcapNumIn, int32_t aplIn)
 {
     tokenNode->apl = aplIn;
 
@@ -599,7 +604,7 @@ uint32_t UpdateTokenInfoInList(NativeTokenList *tokenNode, const char **dcapsIn,
     for (int32_t i = 0; i < dcapNumIn; i++) {
         int32_t len = strlen(dcapsIn[i]) + 1;
         tokenNode->dcaps[i] = (char *)malloc(sizeof(char) * len);
-        if (tokenNode->dcaps[i] != NULL && (strcpy_s(tokenNode->dcaps[i], len, dcapsIn[i]) != EOK)) {
+        if (tokenNode->dcaps[i] == NULL || (strcpy_s(tokenNode->dcaps[i], len, dcapsIn[i]) != EOK)) {
             ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:copy dcapsIn[%d] failed.", __func__, i);
             FreeDcaps(tokenNode->dcaps, i);
             return ATRET_FAILED;
@@ -608,7 +613,7 @@ uint32_t UpdateTokenInfoInList(NativeTokenList *tokenNode, const char **dcapsIn,
     return ATRET_SUCCESS;
 }
 
-uint32_t UpdateItemcontent(const NativeTokenList *tokenNode, cJSON *record)
+static uint32_t UpdateItemcontent(const NativeTokenList *tokenNode, cJSON *record)
 {
     cJSON *itemApl =  cJSON_CreateNumber(tokenNode->apl);
     if (itemApl == NULL) {
@@ -645,7 +650,7 @@ uint32_t UpdateItemcontent(const NativeTokenList *tokenNode, cJSON *record)
     return ATRET_SUCCESS;
 }
 
-uint32_t UpdateGoalItemFromRecord(const NativeTokenList *tokenNode, cJSON *record)
+static uint32_t UpdateGoalItemFromRecord(const NativeTokenList *tokenNode, cJSON *record)
 {
     int32_t arraySize = cJSON_GetArraySize(record);
     for (int32_t i = 0; i < arraySize; i++) {
@@ -667,7 +672,7 @@ uint32_t UpdateGoalItemFromRecord(const NativeTokenList *tokenNode, cJSON *recor
     return ATRET_FAILED;
 }
 
-uint32_t UpdateTokenInfoInCfgFile(NativeTokenList *tokenNode)
+static uint32_t UpdateTokenInfoInCfgFile(NativeTokenList *tokenNode)
 {
     cJSON *record = NULL;
     char *fileBuff = NULL;
-- 
Gitee


From 24a0c5b6b90300a1ed7282f521fc75ddbebb8544 Mon Sep 17 00:00:00 2001
From: l00520400 <linshuqing2@huawei.com>
Date: Fri, 11 Mar 2022 16:41:50 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: l00520400 <linshuqing2@huawei.com>
Change-Id: I941d3c0f80679e2f80b22f805b607c262965626a
Signed-off-by: l00520400 <linshuqing2@huawei.com>
---
 frameworks/accesstoken/BUILD.gn               |   1 +
 .../include/i_accesstoken_manager.h           |   4 +
 .../include/permission_list_state_parcel.h    |  39 +++++
 .../src/permission_list_state_parcel.cpp      |  52 +++++++
 .../accesstoken/include/access_token.h        |   7 +
 .../accesstoken/include/accesstoken_kit.h     |   2 +
 .../include/permission_list_state.h           |  33 ++++
 .../accesstoken/src/accesstoken_kit.cpp       |   9 ++
 .../src/accesstoken_manager_client.cpp        |  36 +++++
 .../src/accesstoken_manager_client.h          |   1 +
 .../src/accesstoken_manager_proxy.cpp         |  50 ++++++
 .../src/accesstoken_manager_proxy.h           |   3 +
 .../unittest/src/accesstoken_kit_test.cpp     | 144 +++++++++++++++++-
 .../include/permission/permission_manager.h   |   3 +
 .../service/accesstoken_manager_service.h     |   2 +
 .../service/accesstoken_manager_stub.h        |   1 +
 .../cpp/src/permission/permission_manager.cpp |  33 ++++
 .../service/accesstoken_manager_service.cpp   |  26 ++++
 .../src/service/accesstoken_manager_stub.cpp  |  24 +++
 19 files changed, 465 insertions(+), 5 deletions(-)
 create mode 100644 frameworks/accesstoken/include/permission_list_state_parcel.h
 create mode 100644 frameworks/accesstoken/src/permission_list_state_parcel.cpp
 create mode 100644 interfaces/innerkits/accesstoken/include/permission_list_state.h

diff --git a/frameworks/accesstoken/BUILD.gn b/frameworks/accesstoken/BUILD.gn
index 6c3e6db17..3471db521 100644
--- a/frameworks/accesstoken/BUILD.gn
+++ b/frameworks/accesstoken/BUILD.gn
@@ -40,6 +40,7 @@ ohos_shared_library("accesstoken_communication_adapter_cxx") {
     "src/hap_token_info_parcel.cpp",
     "src/native_token_info_parcel.cpp",
     "src/permission_def_parcel.cpp",
+    "src/permission_list_state_parcel.cpp",
     "src/permission_state_full_parcel.cpp",
   ]
 
diff --git a/frameworks/accesstoken/include/i_accesstoken_manager.h b/frameworks/accesstoken/include/i_accesstoken_manager.h
index f620e2f56..4eba3f731 100644
--- a/frameworks/accesstoken/include/i_accesstoken_manager.h
+++ b/frameworks/accesstoken/include/i_accesstoken_manager.h
@@ -27,6 +27,7 @@
 #include "iremote_broker.h"
 #include "native_token_info_parcel.h"
 #include "permission_def_parcel.h"
+#include "permission_list_state_parcel.h"
 #include "permission_state_full_parcel.h"
 
 namespace OHOS {
@@ -45,6 +46,8 @@ public:
     virtual int GetReqPermissions(
         AccessTokenID tokenID, std::vector<PermissionStateFullParcel>& reqPermList, bool isSystemGrant) = 0;
     virtual int GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName) = 0;
+    virtual PermissionOper GetPermissionsState(
+        AccessTokenID tokenID, std::vector<PermissionListStateParcel>& permListParcel) = 0;
     virtual int GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag) = 0;
     virtual int RevokePermission(AccessTokenID tokenID, const std::string& permissionName, int flag) = 0;
     virtual int ClearUserGrantedPermissionState(AccessTokenID tokenID) = 0;
@@ -101,6 +104,7 @@ public:
         GET_NATIVE_REMOTE_TOKEN = 0xff2f,
 
         DUMP_TOKENINFO = 0xff30,
+        GET_PERMISSION_OPER_STATE = 0xff31,
     };
 };
 } // namespace AccessToken
diff --git a/frameworks/accesstoken/include/permission_list_state_parcel.h b/frameworks/accesstoken/include/permission_list_state_parcel.h
new file mode 100644
index 000000000..c2c180fae
--- /dev/null
+++ b/frameworks/accesstoken/include/permission_list_state_parcel.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INTERFACES_INNER_KITS_PERMISSION_PERMISSION_LIST_STATE_PARCEL_H
+#define INTERFACES_INNER_KITS_PERMISSION_PERMISSION_LIST_STATE_PARCEL_H
+
+#include "permission_list_state.h"
+#include "parcel.h"
+
+namespace OHOS {
+namespace Security {
+namespace AccessToken {
+struct PermissionListStateParcel final : public Parcelable {
+    PermissionListStateParcel() = default;
+
+    ~PermissionListStateParcel() override = default;
+
+    bool Marshalling(Parcel &out) const override;
+
+    static PermissionListStateParcel *Unmarshalling(Parcel &in);
+
+    PermissionListState permsState;
+};
+}  // namespace AccessToken
+}  // namespace Security
+}  // namespace OHOS
+#endif  // INTERFACES_INNER_KITS_PERMISSION_PERMISSION_LIST_STATE_PARCEL_H
diff --git a/frameworks/accesstoken/src/permission_list_state_parcel.cpp b/frameworks/accesstoken/src/permission_list_state_parcel.cpp
new file mode 100644
index 000000000..55d4c25c2
--- /dev/null
+++ b/frameworks/accesstoken/src/permission_list_state_parcel.cpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "permission_list_state_parcel.h"
+
+namespace OHOS {
+namespace Security {
+namespace AccessToken {
+#define RETURN_IF_FALSE(expr) \
+    if (!(expr)) { \
+        return false; \
+    }
+
+#define RELEASE_IF_FALSE(expr, obj) \
+    if (!(expr)) { \
+        delete (obj); \
+        (obj) = nullptr; \
+        return (obj); \
+    }
+
+bool PermissionListStateParcel::Marshalling(Parcel& out) const
+{
+    RETURN_IF_FALSE(out.WriteString(this->permsState.permissionName));
+    RETURN_IF_FALSE(out.WriteInt32(this->permsState.state));
+    return true;
+}
+
+PermissionListStateParcel* PermissionListStateParcel::Unmarshalling(Parcel& in)
+{
+    auto* permissionStateParcel = new (std::nothrow) PermissionListStateParcel();
+    RELEASE_IF_FALSE(permissionStateParcel != nullptr, permissionStateParcel);
+
+    RELEASE_IF_FALSE(in.ReadString(permissionStateParcel->permsState.permissionName), permissionStateParcel);
+    RELEASE_IF_FALSE(in.ReadInt32(permissionStateParcel->permsState.state), permissionStateParcel);
+
+    return permissionStateParcel;
+}
+} // namespace AccessToken
+} // namespace Security
+} // namespace OHOS
\ No newline at end of file
diff --git a/interfaces/innerkits/accesstoken/include/access_token.h b/interfaces/innerkits/accesstoken/include/access_token.h
index 44130adea..f4f9b492b 100644
--- a/interfaces/innerkits/accesstoken/include/access_token.h
+++ b/interfaces/innerkits/accesstoken/include/access_token.h
@@ -72,6 +72,13 @@ typedef enum TypePermissionFlag {
     PERMISSION_USER_FIXED = 1 << 1,
     PERMISSION_SYSTEM_FIXED = 1 << 2,
 } PermissionFlag;
+
+typedef enum TypePermissionOper {
+    DYNAMIC_OPER = -1,
+    PASS_OPER = 0,
+    SETTING_OPER = 1,
+    INVALID_OPER = 2,
+} PermissionOper;
 } // namespace AccessToken
 } // namespace Security
 } // namespace OHOS
diff --git a/interfaces/innerkits/accesstoken/include/accesstoken_kit.h b/interfaces/innerkits/accesstoken/include/accesstoken_kit.h
index 9f6243cd2..a8a0442f1 100644
--- a/interfaces/innerkits/accesstoken/include/accesstoken_kit.h
+++ b/interfaces/innerkits/accesstoken/include/accesstoken_kit.h
@@ -23,6 +23,7 @@
 #include "hap_token_info.h"
 #include "native_token_info.h"
 #include "permission_def.h"
+#include "permission_list_state.h"
 #include "permission_state_full.h"
 
 namespace OHOS {
@@ -51,6 +52,7 @@ public:
     static int GetReqPermissions(
         AccessTokenID tokenID, std::vector<PermissionStateFull>& reqPermList, bool isSystemGrant);
     static int GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName);
+    static PermissionOper GetPermissionsState(AccessTokenID tokenID, std::vector<PermissionListState>& permList);
     static int GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag);
     static int RevokePermission(AccessTokenID tokenID, const std::string& permissionName, int flag);
     static int ClearUserGrantedPermissionState(AccessTokenID tokenID);
diff --git a/interfaces/innerkits/accesstoken/include/permission_list_state.h b/interfaces/innerkits/accesstoken/include/permission_list_state.h
new file mode 100644
index 000000000..d093504b5
--- /dev/null
+++ b/interfaces/innerkits/accesstoken/include/permission_list_state.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INTERFACES_INNER_KITS_ACCESSTOKEN_PERMISSION_LIST_STATE_H
+#define INTERFACES_INNER_KITS_ACCESSTOKEN_PERMISSION_LIST_STATE_H
+
+#include <string>
+#include <vector>
+
+namespace OHOS {
+namespace Security {
+namespace AccessToken {
+class PermissionListState final {
+public:
+    std::string permissionName;
+    int state;
+};
+} // namespace AccessToken
+} // namespace Security
+} // namespace OHOS
+#endif // INTERFACES_INNER_KITS_ACCESSTOKEN_PERMISSION_LIST_STATE_H
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
index f8ba04b10..123443185 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
@@ -146,6 +146,15 @@ int AccessTokenKit::GetNativeTokenInfo(AccessTokenID tokenID, NativeTokenInfo& n
     return AccessTokenManagerClient::GetInstance().GetNativeTokenInfo(tokenID, nativeTokenInfoRes);
 }
 
+PermissionOper AccessTokenKit::GetPermissionsState(AccessTokenID tokenID, std::vector<PermissionListState>& permList)
+{
+    ACCESSTOKEN_LOG_INFO(LABEL, "tokenID=%{public}d", tokenID);
+    if (tokenID == 0) {
+        ACCESSTOKEN_LOG_ERROR(LABEL, "tokenID is invalid");
+        return INVALID_OPER;
+    }
+    return AccessTokenManagerClient::GetInstance().GetPermissionsState(tokenID, permList);
+}
 int AccessTokenKit::VerifyAccessToken(AccessTokenID tokenID, const std::string& permissionName)
 {
     ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called", __func__);
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
index 9d419a67a..2ee717155 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
@@ -126,6 +126,42 @@ int AccessTokenManagerClient::GetPermissionFlag(AccessTokenID tokenID, const std
     return proxy->GetPermissionFlag(tokenID, permissionName);
 }
 
+PermissionOper AccessTokenManagerClient::GetPermissionsState(
+    AccessTokenID tokenID, std::vector<PermissionListState>& permList)
+{
+    ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s: called!", __func__);
+    auto proxy = GetProxy();
+    if (proxy == nullptr) {
+        ACCESSTOKEN_LOG_ERROR(LABEL, "proxy is null.");
+        return INVALID_OPER;
+    }
+
+    size_t len = permList.size();
+    if (len == 0) {
+        ACCESSTOKEN_LOG_ERROR(LABEL, "len is zero.");
+        return INVALID_OPER;
+    }
+
+    std::vector<PermissionListStateParcel> parcelList;
+
+    for (auto perm : permList) {
+        PermissionListStateParcel permParcel;
+        permParcel.permsState = perm;
+        parcelList.emplace_back(permParcel);
+    }
+
+    PermissionOper result = proxy->GetPermissionsState(tokenID, parcelList);
+
+    if (len != parcelList.size()) {
+        return INVALID_OPER;
+    }
+    for (uint32_t i = 0; i < len; i++) {
+        PermissionListState perm = parcelList[i].permsState;
+        permList[i].state = perm.state;
+    }
+    return result;
+}
+
 int AccessTokenManagerClient::GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag)
 {
     ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s: called!", __func__);
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h
index 74df766ed..1015106fb 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h
@@ -47,6 +47,7 @@ public:
     int GetReqPermissions(
         AccessTokenID tokenID, std::vector<PermissionStateFull>& reqPermList, bool isSystemGrant);
     int GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName);
+    PermissionOper GetPermissionsState(AccessTokenID tokenID, std::vector<PermissionListState>& permList);
     int GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag);
     int RevokePermission(AccessTokenID tokenID, const std::string& permissionName, int flag);
     int ClearUserGrantedPermissionState(AccessTokenID tokenID);
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp
index 218f1da47..5e31f21bc 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp
@@ -241,6 +241,56 @@ int AccessTokenManagerProxy::GetPermissionFlag(AccessTokenID tokenID, const std:
     return result;
 }
 
+PermissionOper AccessTokenManagerProxy::GetPermissionsState(
+    AccessTokenID tokenID, std::vector<PermissionListStateParcel>& permListParcel)
+{
+    MessageParcel data;
+    data.WriteInterfaceToken(IAccessTokenManager::GetDescriptor());
+    if (!data.WriteUint32(tokenID)) {
+        ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write tokenID");
+        return INVALID_OPER;
+    }
+    if (!data.WriteUint32(permListParcel.size())) {
+        ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write permListParcel size");
+        return INVALID_OPER;
+    }
+    for (auto permission : permListParcel) {
+        if (!data.WriteParcelable(&permission)) {
+            ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write permListParcel");
+            return INVALID_OPER;
+        }
+    }
+
+    MessageParcel reply;
+    MessageOption option(MessageOption::TF_SYNC);
+    sptr<IRemoteObject> remote = Remote();
+    if (remote == nullptr) {
+        ACCESSTOKEN_LOG_ERROR(LABEL, "remote service null.");
+        return INVALID_OPER;
+    }
+    int32_t requestResult = remote->SendRequest(
+        static_cast<uint32_t>(IAccessTokenManager::InterfaceCode::GET_PERMISSION_OPER_STATE), data, reply, option);
+    if (requestResult != NO_ERROR) {
+        ACCESSTOKEN_LOG_ERROR(LABEL, "request fail, result: %{public}d", requestResult);
+        return INVALID_OPER;
+    }
+
+    int32_t size = reply.ReadInt32();
+    if (size != permListParcel.size()) {
+        return INVALID_OPER;
+    }
+    for (int i = 0; i < size; i++) {
+        sptr<PermissionListStateParcel> permissionReq = reply.ReadParcelable<PermissionListStateParcel>();
+        if (permissionReq != nullptr) {
+            permListParcel[i].permsState.state = permissionReq->permsState.state;
+        }
+    }
+
+    PermissionOper result = static_cast<PermissionOper>(reply.ReadInt32());
+    ACCESSTOKEN_LOG_DEBUG(LABEL, "result from server data = %{public}d", result);
+    return result;
+}
+
 int AccessTokenManagerProxy::GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag)
 {
     MessageParcel data;
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
index 5463e216b..454287848 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
@@ -28,6 +28,7 @@
 #include "iremote_proxy.h"
 #include "native_token_info_parcel.h"
 #include "permission_def_parcel.h"
+#include "permission_list_state_parcel.h"
 #include "permission_state_full_parcel.h"
 
 namespace OHOS {
@@ -47,6 +48,8 @@ public:
     int GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName) override;
     int GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag) override;
     int RevokePermission(AccessTokenID tokenID, const std::string& permissionName, int flag) override;
+    PermissionOper GetPermissionsState(
+        AccessTokenID tokenID, std::vector<PermissionListStateParcel>& permList) override;
     int ClearUserGrantedPermissionState(AccessTokenID tokenID) override;
     int GetTokenType(AccessTokenID tokenID) override;
     int CheckNativeDCap(AccessTokenID tokenID, const std::string& dcap) override;
diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
index 34e30ce68..ad6833d24 100644
--- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
+++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
@@ -157,8 +157,46 @@ void AccessTokenKitTest::SetUp()
         .provisionEnable = false,
         .distributedSceneEnable = false
     };
+    PermissionDef testPermDef1 = {
+        .permissionName = "ohos.permission.testPermDef1",
+        .bundleName = TEST_BUNDLE_NAME,
+        .grantMode = GrantMode::USER_GRANT,
+        .availableLevel = APL_NORMAL,
+        .provisionEnable = false,
+        .distributedSceneEnable = false
+    };
+
+    PermissionDef testPermDef2 = {
+        .permissionName = "ohos.permission.testPermDef2",
+        .bundleName = TEST_BUNDLE_NAME,
+        .grantMode = GrantMode::USER_GRANT,
+        .availableLevel = APL_NORMAL,
+        .provisionEnable = false,
+        .distributedSceneEnable = false
+    };
+
+    PermissionDef testPermDef3 = {
+        .permissionName = "ohos.permission.testPermDef3",
+        .bundleName = TEST_BUNDLE_NAME,
+        .grantMode = GrantMode::USER_GRANT,
+        .availableLevel = APL_NORMAL,
+        .provisionEnable = false,
+        .distributedSceneEnable = false
+    };
+    PermissionDef testPermDef4 = {
+        .permissionName = "ohos.permission.testPermDef4",
+        .bundleName = TEST_BUNDLE_NAME,
+        .grantMode = GrantMode::USER_GRANT,
+        .availableLevel = APL_NORMAL,
+        .provisionEnable = false,
+        .distributedSceneEnable = false
+    };
     policy.permList.emplace_back(permissionDefAlpha);
     policy.permList.emplace_back(permissionDefBeta);
+    policy.permList.emplace_back(testPermDef1);
+    policy.permList.emplace_back(testPermDef2);
+    policy.permList.emplace_back(testPermDef3);
+    policy.permList.emplace_back(testPermDef4);
 
     PermissionStateFull permStatAlpha = {
         .permissionName = TEST_PERMISSION_NAME_ALPHA,
@@ -174,11 +212,47 @@ void AccessTokenKitTest::SetUp()
         .grantStatus = {PermissionState::PERMISSION_GRANTED},
         .grantFlags = {PermissionFlag::PERMISSION_USER_SET}
     };
+    PermissionStateFull permTestState1 = {
+        .grantFlags = {0},
+        .grantStatus = {PermissionState::PERMISSION_DENIED},
+        .isGeneral = true,
+        .permissionName = "ohos.permission.testPermDef1",
+        .resDeviceID = {"local"}
+    };
+
+    PermissionStateFull permTestState2 = {
+        .grantFlags = {1},
+        .grantStatus = {PermissionState::PERMISSION_DENIED},
+        .isGeneral = true,
+        .permissionName = "ohos.permission.testPermDef2",
+        .resDeviceID = {"local"}
+    };
+
+    PermissionStateFull permTestState3 = {
+        .grantFlags = {2},
+        .grantStatus = {PermissionState::PERMISSION_DENIED},
+        .isGeneral = true,
+        .permissionName = "ohos.permission.testPermDef3",
+        .resDeviceID = {"local"}
+    };
+
+    PermissionStateFull permTestState4 = {
+        .grantFlags = {1},
+        .grantStatus = {PermissionState::PERMISSION_GRANTED},
+        .isGeneral = true,
+        .permissionName = "ohos.permission.testPermDef4",
+        .resDeviceID = {"local"}
+    };
+
     policy.permStateList.emplace_back(permStatAlpha);
     policy.permStateList.emplace_back(permStatBeta);
     policy.permStateList.emplace_back(g_grantPermissionReq);
     policy.permStateList.emplace_back(g_revokePermissionReq);
-
+    policy.permStateList.emplace_back(permTestState1);
+    policy.permStateList.emplace_back(permTestState1);
+    policy.permStateList.emplace_back(permTestState2);
+    policy.permStateList.emplace_back(permTestState3);
+    policy.permStateList.emplace_back(permTestState4);
     AccessTokenKit::AllocHapToken(info, policy);
     AccessTokenID tokenID = AccessTokenKit::GetHapTokenID(g_infoManagerTestInfoParms.userID,
                                                           g_infoManagerTestInfoParms.bundleName,
@@ -285,7 +359,7 @@ HWTEST_F(AccessTokenKitTest, GetDefPermissions001, TestSize.Level1)
     std::vector<PermissionDef> permDefList;
     int ret = AccessTokenKit::GetDefPermissions(tokenID, permDefList);
     ASSERT_EQ(RET_SUCCESS, ret);
-    ASSERT_EQ(2, permDefList.size());
+    ASSERT_EQ(6, permDefList.size());
 }
 
 /**
@@ -350,7 +424,7 @@ HWTEST_F(AccessTokenKitTest, GetDefPermissions004, TestSize.Level0)
         std::vector<PermissionDef> permDefList;
         ret = AccessTokenKit::GetDefPermissions(tokenID, permDefList);
         ASSERT_EQ(RET_SUCCESS, ret);
-        ASSERT_EQ(2, permDefList.size());
+        ASSERT_EQ(6, permDefList.size());
     }
 }
 
@@ -367,7 +441,7 @@ HWTEST_F(AccessTokenKitTest, GetReqPermissions001, TestSize.Level1)
     std::vector<PermissionStateFull> permStatList;
     int ret = AccessTokenKit::GetReqPermissions(tokenID, permStatList, false);
     ASSERT_EQ(RET_SUCCESS, ret);
-    ASSERT_EQ(1, permStatList.size());
+    ASSERT_EQ(5, permStatList.size());
     ASSERT_EQ(TEST_PERMISSION_NAME_ALPHA, permStatList[0].permissionName);
 
     ret = AccessTokenKit::VerifyAccessToken(tokenID, TEST_PERMISSION_NAME_ALPHA);
@@ -466,7 +540,7 @@ HWTEST_F(AccessTokenKitTest, GetReqPermissions005, TestSize.Level0)
         std::vector<PermissionStateFull> permStatList;
         ret = AccessTokenKit::GetReqPermissions(tokenID, permStatList, false);
         ASSERT_EQ(RET_SUCCESS, ret);
-        ASSERT_EQ(1, permStatList.size());
+        ASSERT_EQ(5, permStatList.size());
         ASSERT_EQ(TEST_PERMISSION_NAME_ALPHA, permStatList[0].permissionName);
     }
 }
@@ -3098,4 +3172,64 @@ HWTEST_F(AccessTokenKitTest, SetRemoteNativeTokenInfo001, TestSize.Level1)
     ASSERT_EQ(resultInfo.dcap[1], "DMSDCAP");
     ASSERT_EQ(resultInfo.tokenID, mapID);
     ASSERT_EQ(resultInfo.tokenAttr, native1.tokenAttr);
+}
+
+/**
+ * @tc.name: GetPermissionsState001
+ * @tc.desc: get permission list state
+ * @tc.type: FUNC
+ * @tc.require:AR000GK6T6
+ */
+HWTEST_F(AccessTokenKitTest, GetPermissionsState001, TestSize.Level1)
+{
+    AccessTokenID tokenID = GetAccessTokenID(TEST_USER_ID, TEST_BUNDLE_NAME, 0);
+    ASSERT_NE(0, tokenID);
+    PermissionListState perm1 = {
+        .permissionName = "ohos.permission.testPermDef1",
+        .state = -1,
+    };
+    PermissionListState perm2 = {
+        .permissionName = "ohos.permission.testPermDef2",
+        .state = -1,
+    };
+    PermissionListState perm3 = {
+        .permissionName = "ohos.permission.testPermDef3",
+        .state = -1,
+    };
+    PermissionListState perm4 = {
+        .permissionName = "ohos.permission.testPermDef4",
+        .state = -1,
+    };
+
+    std::vector<PermissionListState> permsList1;
+    permsList1.emplace_back(perm1);
+    permsList1.emplace_back(perm2);
+    permsList1.emplace_back(perm3);
+    permsList1.emplace_back(perm4);
+
+    PermissionOper ret = AccessTokenKit::GetPermissionsState(tokenID, permsList1);
+    ASSERT_EQ(DYNAMIC_OPER, ret);
+    ASSERT_EQ(4, permsList1.size());
+    ASSERT_EQ(1, permsList1[0].state);
+    ASSERT_EQ(1, permsList1[1].state);
+    ASSERT_EQ(0, permsList1[2].state);
+    ASSERT_EQ(0, permsList1[3].state);
+    ASSERT_EQ("ohos.permission.testPermDef1", permsList1[0].permissionName);
+    ASSERT_EQ("ohos.permission.testPermDef2", permsList1[1].permissionName);
+    ASSERT_EQ("ohos.permission.testPermDef3", permsList1[2].permissionName);
+    ASSERT_EQ("ohos.permission.testPermDef4", permsList1[3].permissionName);
+
+    PermissionListState perm5 = {
+        .permissionName = "ohos.permission.testPermDef5",
+        .state = -1,
+    };
+    permsList1.emplace_back(perm5);
+    ret = AccessTokenKit::GetPermissionsState(tokenID, permsList1);
+    ASSERT_EQ(INVALID_OPER, ret);
+
+    std::vector<PermissionListState> permsList2;
+    permsList2.emplace_back(perm3);
+    permsList2.emplace_back(perm4);
+    ret = AccessTokenKit::GetPermissionsState(tokenID, permsList2);
+    ASSERT_EQ(PASS_OPER, ret);
 }
\ No newline at end of file
diff --git a/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h b/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h
index cdc088127..119f9ba22 100644
--- a/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h
+++ b/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h
@@ -22,6 +22,7 @@
 #include "access_token.h"
 #include "hap_token_info_inner.h"
 #include "permission_def.h"
+#include "permission_list_state.h"
 #include "permission_state_full.h"
 
 #include "rwlock.h"
@@ -47,6 +48,8 @@ public:
     void GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag);
     void RevokePermission(AccessTokenID tokenID, const std::string& permissionName, int flag);
     void ClearUserGrantedPermissionState(AccessTokenID tokenID);
+    int NeedDynamicPop(std::vector<PermissionStateFull> permsList,
+        PermissionListState &permState, bool &res);
 private:
     PermissionManager();
     void UpdateTokenPermissionState(
diff --git a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h
index 589b641e4..3ac58c361 100644
--- a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h
+++ b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h
@@ -46,6 +46,8 @@ public:
     int GetDefPermissions(AccessTokenID tokenID, std::vector<PermissionDefParcel>& permList) override;
     int GetReqPermissions(
         AccessTokenID tokenID, std::vector<PermissionStateFullParcel>& reqPermList, bool isSystemGrant) override;
+    PermissionOper GetPermissionsState(
+        AccessTokenID tokenID, std::vector<PermissionListStateParcel>& reqPermList) override;
     int GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName) override;
     int GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag) override;
     int RevokePermission(AccessTokenID tokenID, const std::string& permissionName, int flag) override;
diff --git a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_stub.h b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_stub.h
index e38295800..866702bd5 100644
--- a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_stub.h
+++ b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_stub.h
@@ -39,6 +39,7 @@ private:
     void GetDefPermissionInner(MessageParcel& data, MessageParcel& reply);
     void GetDefPermissionsInner(MessageParcel& data, MessageParcel& reply);
     void GetReqPermissionsInner(MessageParcel& data, MessageParcel& reply);
+    void GetPermissionsStateInner(MessageParcel& data, MessageParcel& reply);
     void GetPermissionFlagInner(MessageParcel& data, MessageParcel& reply);
     void GrantPermissionInner(MessageParcel& data, MessageParcel& reply);
     void RevokePermissionInner(MessageParcel& data, MessageParcel& reply);
diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
index 4f352d8b3..296ee92d9 100644
--- a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
+++ b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
@@ -195,6 +195,39 @@ int PermissionManager::GetReqPermissions(
     return RET_SUCCESS;
 }
 
+int PermissionManager::NeedDynamicPop(std::vector<PermissionStateFull> permsList,
+    PermissionListState &permState, bool &res)
+{
+    bool foundGoal = false;
+    int32_t goalGrantStatus;
+    int32_t goalGrantFlags;
+    for (auto& perm : permsList) {
+        if (perm.permissionName == permState.permissionName) {
+            foundGoal = true;
+            goalGrantStatus = perm.grantStatus[0];
+            goalGrantFlags = perm.grantFlags[0];
+            break;
+        }
+    }
+    if (foundGoal == false) {
+        ACCESSTOKEN_LOG_ERROR(LABEL,
+            "can not find permission: %{public}s!", permState.permissionName.c_str());
+        return RET_FAILED;
+    }
+
+    if (goalGrantStatus == PERMISSION_DENIED) {
+        if ((goalGrantFlags == DEFAULT_PERMISSION_FLAGS) ||
+            (goalGrantFlags == PERMISSION_USER_SET)) {
+            permState.state = 1;
+            res = true;
+            return RET_SUCCESS;
+        }
+    }
+    ACCESSTOKEN_LOG_INFO(LABEL, "do not need dynamic pop");
+    permState.state = 0;
+    return RET_SUCCESS;
+}
+
 int PermissionManager::GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName)
 {
     ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called, tokenID: 0x%{public}x, permissionName: %{public}s",
diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
index 997da72d3..aa7ea1b86 100644
--- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
+++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
@@ -23,6 +23,7 @@
 #include "hap_token_info_inner.h"
 #include "native_token_info_inner.h"
 #include "native_token_receptor.h"
+#include "permission_list_state.h"
 #include "permission_manager.h"
 
 namespace OHOS {
@@ -129,6 +130,31 @@ int AccessTokenManagerService::GetReqPermissions(
     return ret;
 }
 
+PermissionOper AccessTokenManagerService::GetPermissionsState(
+    AccessTokenID tokenID, std::vector<PermissionListStateParcel>& reqPermList)
+{
+    ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called, id: 0x%{public}x", __func__, tokenID);
+    bool needRes = false;
+    std::vector<PermissionStateFull> permsList;
+    int ret = PermissionManager::GetInstance().GetReqPermissions(tokenID, permsList, false);
+    if (ret != RET_SUCCESS) {
+        return INVALID_OPER;
+    }
+
+    int32_t size = reqPermList.size();
+    ACCESSTOKEN_LOG_INFO(LABEL, "reqPermList size: 0x%{public}x", size);
+    for (int32_t i = 0; i < size; i++) {
+        ret = PermissionManager::GetInstance().NeedDynamicPop(permsList, reqPermList[i].permsState, needRes);
+        if (ret != RET_SUCCESS) {
+            return INVALID_OPER;
+        }
+    }
+    if (needRes) {
+        return DYNAMIC_OPER;
+    }
+    return PASS_OPER;
+}
+
 int AccessTokenManagerService::GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName)
 {
     ACCESSTOKEN_LOG_INFO(LABEL,
diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
index fe3f37809..db1cc29df 100644
--- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
+++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
@@ -114,6 +114,28 @@ void AccessTokenManagerStub::GetReqPermissionsInner(MessageParcel& data, Message
     reply.WriteInt32(result);
 }
 
+void AccessTokenManagerStub::GetPermissionsStateInner(MessageParcel& data, MessageParcel& reply)
+{
+    ACCESSTOKEN_LOG_INFO(LABEL, "called");
+    std::vector<PermissionListStateParcel> permList;
+    AccessTokenID tokenID = data.ReadUint32();
+    uint32_t size = data.ReadUint32();
+    for (uint32_t i = 0; i < size; i++) {
+        sptr<PermissionListStateParcel> permissionParcel = data.ReadParcelable<PermissionListStateParcel>();
+        if (permissionParcel != nullptr) {
+            permList.emplace_back(*permissionParcel);
+        }
+    }
+
+    PermissionOper result = this->GetPermissionsState(tokenID, permList);
+
+    reply.WriteUint32(permList.size());
+    for (auto perm : permList) {
+        reply.WriteParcelable(&perm);
+    }
+    reply.WriteInt32(result);
+}
+
 void AccessTokenManagerStub::GetPermissionFlagInner(MessageParcel& data, MessageParcel& reply)
 {
     unsigned int callingTokenID = IPCSkeleton::GetCallingTokenID();
@@ -462,6 +484,8 @@ AccessTokenManagerStub::AccessTokenManagerStub()
         &AccessTokenManagerStub::GetRemoteNativeTokenIDInner;
     requestFuncMap_[static_cast<uint32_t>(IAccessTokenManager::InterfaceCode::DUMP_TOKENINFO)] =
         &AccessTokenManagerStub::DumpTokenInfoInner;
+    requestFuncMap_[static_cast<uint32_t>(IAccessTokenManager::InterfaceCode::GET_PERMISSION_OPER_STATE)] =
+        &AccessTokenManagerStub::GetPermissionsStateInner;
 }
 
 AccessTokenManagerStub::~AccessTokenManagerStub()
-- 
Gitee


From 67116ecb5ee59ce13efede69f4252bb9e2fbb83a Mon Sep 17 00:00:00 2001
From: l00520400 <linshuqing2@huawei.com>
Date: Sat, 12 Mar 2022 21:01:09 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: l00520400 <linshuqing2@huawei.com>
Change-Id: I1a7d8ef1b41fb05d902b75af81cd4433b71779bd
Signed-off-by: l00520400 <linshuqing2@huawei.com>
---
 .../include/i_accesstoken_manager.h           |  4 +--
 .../accesstoken/include/access_token.h        |  4 +--
 .../accesstoken/include/accesstoken_kit.h     |  2 +-
 .../accesstoken/src/accesstoken_kit.cpp       | 10 +++----
 .../src/accesstoken_manager_client.cpp        | 10 +++----
 .../src/accesstoken_manager_client.h          |  2 +-
 .../src/accesstoken_manager_proxy.cpp         | 19 +++++++-------
 .../src/accesstoken_manager_proxy.h           |  3 +--
 .../innerkits/accesstoken/test/BUILD.gn       |  2 ++
 .../unittest/src/accesstoken_kit_test.cpp     | 26 ++++++++++++-------
 .../innerkits/nativetoken/src/nativetoken.c   |  5 ++++
 .../include/permission/permission_manager.h   |  4 +--
 .../service/accesstoken_manager_service.h     |  4 +--
 .../service/accesstoken_manager_stub.h        |  2 +-
 .../cpp/src/permission/permission_manager.cpp | 26 +++++++++++--------
 .../service/accesstoken_manager_service.cpp   | 18 ++++++++-----
 .../src/service/accesstoken_manager_stub.cpp  | 11 ++++----
 .../cpp/src/token/accesstoken_id_manager.cpp  |  3 ++-
 18 files changed, 87 insertions(+), 68 deletions(-)

diff --git a/frameworks/accesstoken/include/i_accesstoken_manager.h b/frameworks/accesstoken/include/i_accesstoken_manager.h
index 4eba3f731..c110dbf23 100644
--- a/frameworks/accesstoken/include/i_accesstoken_manager.h
+++ b/frameworks/accesstoken/include/i_accesstoken_manager.h
@@ -46,8 +46,8 @@ public:
     virtual int GetReqPermissions(
         AccessTokenID tokenID, std::vector<PermissionStateFullParcel>& reqPermList, bool isSystemGrant) = 0;
     virtual int GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName) = 0;
-    virtual PermissionOper GetPermissionsState(
-        AccessTokenID tokenID, std::vector<PermissionListStateParcel>& permListParcel) = 0;
+    virtual PermissionOper GetSelfPermissionsState(
+        std::vector<PermissionListStateParcel>& permListParcel) = 0;
     virtual int GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag) = 0;
     virtual int RevokePermission(AccessTokenID tokenID, const std::string& permissionName, int flag) = 0;
     virtual int ClearUserGrantedPermissionState(AccessTokenID tokenID) = 0;
diff --git a/interfaces/innerkits/accesstoken/include/access_token.h b/interfaces/innerkits/accesstoken/include/access_token.h
index f4f9b492b..ed5b4b8a6 100644
--- a/interfaces/innerkits/accesstoken/include/access_token.h
+++ b/interfaces/innerkits/accesstoken/include/access_token.h
@@ -74,9 +74,9 @@ typedef enum TypePermissionFlag {
 } PermissionFlag;
 
 typedef enum TypePermissionOper {
-    DYNAMIC_OPER = -1,
+    SETTING_OPER = -1,
     PASS_OPER = 0,
-    SETTING_OPER = 1,
+    DYNAMIC_OPER = 1,
     INVALID_OPER = 2,
 } PermissionOper;
 } // namespace AccessToken
diff --git a/interfaces/innerkits/accesstoken/include/accesstoken_kit.h b/interfaces/innerkits/accesstoken/include/accesstoken_kit.h
index a8a0442f1..c6c5baa6c 100644
--- a/interfaces/innerkits/accesstoken/include/accesstoken_kit.h
+++ b/interfaces/innerkits/accesstoken/include/accesstoken_kit.h
@@ -52,7 +52,7 @@ public:
     static int GetReqPermissions(
         AccessTokenID tokenID, std::vector<PermissionStateFull>& reqPermList, bool isSystemGrant);
     static int GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName);
-    static PermissionOper GetPermissionsState(AccessTokenID tokenID, std::vector<PermissionListState>& permList);
+    static PermissionOper GetSelfPermissionsState(std::vector<PermissionListState>& permList);
     static int GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag);
     static int RevokePermission(AccessTokenID tokenID, const std::string& permissionName, int flag);
     static int ClearUserGrantedPermissionState(AccessTokenID tokenID);
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
index 123443185..d767ddc5d 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
@@ -146,14 +146,10 @@ int AccessTokenKit::GetNativeTokenInfo(AccessTokenID tokenID, NativeTokenInfo& n
     return AccessTokenManagerClient::GetInstance().GetNativeTokenInfo(tokenID, nativeTokenInfoRes);
 }
 
-PermissionOper AccessTokenKit::GetPermissionsState(AccessTokenID tokenID, std::vector<PermissionListState>& permList)
+PermissionOper AccessTokenKit::GetSelfPermissionsState(std::vector<PermissionListState>& permList)
 {
-    ACCESSTOKEN_LOG_INFO(LABEL, "tokenID=%{public}d", tokenID);
-    if (tokenID == 0) {
-        ACCESSTOKEN_LOG_ERROR(LABEL, "tokenID is invalid");
-        return INVALID_OPER;
-    }
-    return AccessTokenManagerClient::GetInstance().GetPermissionsState(tokenID, permList);
+    ACCESSTOKEN_LOG_INFO(LABEL, "called");
+    return AccessTokenManagerClient::GetInstance().GetSelfPermissionsState(permList);
 }
 int AccessTokenKit::VerifyAccessToken(AccessTokenID tokenID, const std::string& permissionName)
 {
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
index 2ee717155..96af39c6a 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
@@ -126,8 +126,8 @@ int AccessTokenManagerClient::GetPermissionFlag(AccessTokenID tokenID, const std
     return proxy->GetPermissionFlag(tokenID, permissionName);
 }
 
-PermissionOper AccessTokenManagerClient::GetPermissionsState(
-    AccessTokenID tokenID, std::vector<PermissionListState>& permList)
+PermissionOper AccessTokenManagerClient::GetSelfPermissionsState(
+    std::vector<PermissionListState>& permList)
 {
     ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s: called!", __func__);
     auto proxy = GetProxy();
@@ -138,8 +138,8 @@ PermissionOper AccessTokenManagerClient::GetPermissionsState(
 
     size_t len = permList.size();
     if (len == 0) {
-        ACCESSTOKEN_LOG_ERROR(LABEL, "len is zero.");
-        return INVALID_OPER;
+        ACCESSTOKEN_LOG_DEBUG(LABEL, "len is zero.");
+        return PASS_OPER;
     }
 
     std::vector<PermissionListStateParcel> parcelList;
@@ -150,7 +150,7 @@ PermissionOper AccessTokenManagerClient::GetPermissionsState(
         parcelList.emplace_back(permParcel);
     }
 
-    PermissionOper result = proxy->GetPermissionsState(tokenID, parcelList);
+    PermissionOper result = proxy->GetSelfPermissionsState(parcelList);
 
     if (len != parcelList.size()) {
         return INVALID_OPER;
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h
index 1015106fb..6f97162f9 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h
@@ -47,7 +47,7 @@ public:
     int GetReqPermissions(
         AccessTokenID tokenID, std::vector<PermissionStateFull>& reqPermList, bool isSystemGrant);
     int GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName);
-    PermissionOper GetPermissionsState(AccessTokenID tokenID, std::vector<PermissionListState>& permList);
+    PermissionOper GetSelfPermissionsState(std::vector<PermissionListState>& permList);
     int GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag);
     int RevokePermission(AccessTokenID tokenID, const std::string& permissionName, int flag);
     int ClearUserGrantedPermissionState(AccessTokenID tokenID);
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp
index 5e31f21bc..56d47b0a4 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp
@@ -241,15 +241,11 @@ int AccessTokenManagerProxy::GetPermissionFlag(AccessTokenID tokenID, const std:
     return result;
 }
 
-PermissionOper AccessTokenManagerProxy::GetPermissionsState(
-    AccessTokenID tokenID, std::vector<PermissionListStateParcel>& permListParcel)
+PermissionOper AccessTokenManagerProxy::GetSelfPermissionsState(
+    std::vector<PermissionListStateParcel>& permListParcel)
 {
     MessageParcel data;
     data.WriteInterfaceToken(IAccessTokenManager::GetDescriptor());
-    if (!data.WriteUint32(tokenID)) {
-        ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write tokenID");
-        return INVALID_OPER;
-    }
     if (!data.WriteUint32(permListParcel.size())) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write permListParcel size");
         return INVALID_OPER;
@@ -275,18 +271,23 @@ PermissionOper AccessTokenManagerProxy::GetPermissionsState(
         return INVALID_OPER;
     }
 
-    int32_t size = reply.ReadInt32();
+    PermissionOper result = static_cast<PermissionOper>(reply.ReadInt32());
+    if (result == INVALID_OPER) {
+        ACCESSTOKEN_LOG_ERROR(LABEL, "result from serve is invalid");
+        return result;
+    }
+    size_t size = reply.ReadUint32();
     if (size != permListParcel.size()) {
+        ACCESSTOKEN_LOG_ERROR(LABEL, "permListParcel size from serve is invalid");
         return INVALID_OPER;
     }
-    for (int i = 0; i < size; i++) {
+    for (uint32_t i = 0; i < size; i++) {
         sptr<PermissionListStateParcel> permissionReq = reply.ReadParcelable<PermissionListStateParcel>();
         if (permissionReq != nullptr) {
             permListParcel[i].permsState.state = permissionReq->permsState.state;
         }
     }
 
-    PermissionOper result = static_cast<PermissionOper>(reply.ReadInt32());
     ACCESSTOKEN_LOG_DEBUG(LABEL, "result from server data = %{public}d", result);
     return result;
 }
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
index 454287848..2772b3da6 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
@@ -48,8 +48,7 @@ public:
     int GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName) override;
     int GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag) override;
     int RevokePermission(AccessTokenID tokenID, const std::string& permissionName, int flag) override;
-    PermissionOper GetPermissionsState(
-        AccessTokenID tokenID, std::vector<PermissionListStateParcel>& permList) override;
+    PermissionOper GetSelfPermissionsState(std::vector<PermissionListStateParcel>& permList) override;
     int ClearUserGrantedPermissionState(AccessTokenID tokenID) override;
     int GetTokenType(AccessTokenID tokenID) override;
     int CheckNativeDCap(AccessTokenID tokenID, const std::string& dcap) override;
diff --git a/interfaces/innerkits/accesstoken/test/BUILD.gn b/interfaces/innerkits/accesstoken/test/BUILD.gn
index a4782cc90..55d2f912a 100644
--- a/interfaces/innerkits/accesstoken/test/BUILD.gn
+++ b/interfaces/innerkits/accesstoken/test/BUILD.gn
@@ -23,6 +23,7 @@ ohos_unittest("libaccesstoken_sdk_test") {
     "//third_party/googletest/include",
     "//base/security/access_token/interfaces/innerkits/accesstoken/include",
     "//base/security/access_token/interfaces/innerkits/nativetoken/include",
+    "//base/security/access_token/interfaces/innerkits/token_setproc/include",
     "//base/security/access_token/frameworks/common/include",
   ]
 
@@ -33,6 +34,7 @@ ohos_unittest("libaccesstoken_sdk_test") {
   deps = [
     "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk",
     "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken",
+    "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
     "//utils/native/base:utils",
   ]
 
diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
index ad6833d24..e6ffbf834 100644
--- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
+++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
@@ -19,6 +19,7 @@
 #include "accesstoken_kit.h"
 #include "nativetoken_kit.h"
 #include "accesstoken_log.h"
+#include "token_setproc.h"
 
 using namespace testing::ext;
 using namespace OHOS::Security::AccessToken;
@@ -3175,15 +3176,17 @@ HWTEST_F(AccessTokenKitTest, SetRemoteNativeTokenInfo001, TestSize.Level1)
 }
 
 /**
- * @tc.name: GetPermissionsState001
+ * @tc.name: GetSelfPermissionsState001
  * @tc.desc: get permission list state
  * @tc.type: FUNC
  * @tc.require:AR000GK6T6
  */
-HWTEST_F(AccessTokenKitTest, GetPermissionsState001, TestSize.Level1)
+HWTEST_F(AccessTokenKitTest, GetSelfPermissionsState001, TestSize.Level1)
 {
     AccessTokenID tokenID = GetAccessTokenID(TEST_USER_ID, TEST_BUNDLE_NAME, 0);
     ASSERT_NE(0, tokenID);
+    ASSERT_EQ(0, SetSelfTokenID(tokenID));
+
     PermissionListState perm1 = {
         .permissionName = "ohos.permission.testPermDef1",
         .state = -1,
@@ -3207,13 +3210,13 @@ HWTEST_F(AccessTokenKitTest, GetPermissionsState001, TestSize.Level1)
     permsList1.emplace_back(perm3);
     permsList1.emplace_back(perm4);
 
-    PermissionOper ret = AccessTokenKit::GetPermissionsState(tokenID, permsList1);
+    PermissionOper ret = AccessTokenKit::GetSelfPermissionsState(permsList1);
     ASSERT_EQ(DYNAMIC_OPER, ret);
     ASSERT_EQ(4, permsList1.size());
-    ASSERT_EQ(1, permsList1[0].state);
-    ASSERT_EQ(1, permsList1[1].state);
-    ASSERT_EQ(0, permsList1[2].state);
-    ASSERT_EQ(0, permsList1[3].state);
+    ASSERT_EQ(DYNAMIC_OPER, permsList1[0].state);
+    ASSERT_EQ(DYNAMIC_OPER, permsList1[1].state);
+    ASSERT_EQ(SETTING_OPER, permsList1[2].state);
+    ASSERT_EQ(PASS_OPER, permsList1[3].state);
     ASSERT_EQ("ohos.permission.testPermDef1", permsList1[0].permissionName);
     ASSERT_EQ("ohos.permission.testPermDef2", permsList1[1].permissionName);
     ASSERT_EQ("ohos.permission.testPermDef3", permsList1[2].permissionName);
@@ -3224,12 +3227,15 @@ HWTEST_F(AccessTokenKitTest, GetPermissionsState001, TestSize.Level1)
         .state = -1,
     };
     permsList1.emplace_back(perm5);
-    ret = AccessTokenKit::GetPermissionsState(tokenID, permsList1);
-    ASSERT_EQ(INVALID_OPER, ret);
+    ret = AccessTokenKit::GetSelfPermissionsState(permsList1);
+    ASSERT_EQ(DYNAMIC_OPER, permsList1[0].state);
+    ASSERT_EQ(DYNAMIC_OPER, ret);
 
     std::vector<PermissionListState> permsList2;
     permsList2.emplace_back(perm3);
     permsList2.emplace_back(perm4);
-    ret = AccessTokenKit::GetPermissionsState(tokenID, permsList2);
+    ret = AccessTokenKit::GetSelfPermissionsState(permsList2);
+    ASSERT_EQ(SETTING_OPER, permsList2[0].state);
+    ASSERT_EQ(PASS_OPER, permsList2[1].state);
     ASSERT_EQ(PASS_OPER, ret);
 }
\ No newline at end of file
diff --git a/interfaces/innerkits/nativetoken/src/nativetoken.c b/interfaces/innerkits/nativetoken/src/nativetoken.c
index 662ba98c1..22d4b5bf7 100644
--- a/interfaces/innerkits/nativetoken/src/nativetoken.c
+++ b/interfaces/innerkits/nativetoken/src/nativetoken.c
@@ -38,6 +38,11 @@ int32_t GetFileBuff(const char *cfg, char **retBuff)
         return ATRET_FAILED;
     }
 
+    if (fileStat.st_size == 0) {
+        *retBuff = NULL;
+        return ATRET_SUCCESS;
+    }
+
     if ((fileStat.st_size < 0) || (fileStat.st_size > MAX_JSON_FILE_LEN)) {
         ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:stat file size is invalid.", __func__);
         return ATRET_FAILED;
diff --git a/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h b/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h
index 119f9ba22..64fa632f5 100644
--- a/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h
+++ b/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h
@@ -48,8 +48,8 @@ public:
     void GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag);
     void RevokePermission(AccessTokenID tokenID, const std::string& permissionName, int flag);
     void ClearUserGrantedPermissionState(AccessTokenID tokenID);
-    int NeedDynamicPop(std::vector<PermissionStateFull> permsList,
-        PermissionListState &permState, bool &res);
+    void GetSelfPermissionState(
+        std::vector<PermissionStateFull> permsList, PermissionListState &permState);
 private:
     PermissionManager();
     void UpdateTokenPermissionState(
diff --git a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h
index 3ac58c361..e60c10ada 100644
--- a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h
+++ b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h
@@ -46,8 +46,8 @@ public:
     int GetDefPermissions(AccessTokenID tokenID, std::vector<PermissionDefParcel>& permList) override;
     int GetReqPermissions(
         AccessTokenID tokenID, std::vector<PermissionStateFullParcel>& reqPermList, bool isSystemGrant) override;
-    PermissionOper GetPermissionsState(
-        AccessTokenID tokenID, std::vector<PermissionListStateParcel>& reqPermList) override;
+    PermissionOper GetSelfPermissionsState(
+        std::vector<PermissionListStateParcel>& reqPermList) override;
     int GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName) override;
     int GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag) override;
     int RevokePermission(AccessTokenID tokenID, const std::string& permissionName, int flag) override;
diff --git a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_stub.h b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_stub.h
index 866702bd5..ff49c9c83 100644
--- a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_stub.h
+++ b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_stub.h
@@ -39,7 +39,7 @@ private:
     void GetDefPermissionInner(MessageParcel& data, MessageParcel& reply);
     void GetDefPermissionsInner(MessageParcel& data, MessageParcel& reply);
     void GetReqPermissionsInner(MessageParcel& data, MessageParcel& reply);
-    void GetPermissionsStateInner(MessageParcel& data, MessageParcel& reply);
+    void GetSelfPermissionsStateInner(MessageParcel& data, MessageParcel& reply);
     void GetPermissionFlagInner(MessageParcel& data, MessageParcel& reply);
     void GrantPermissionInner(MessageParcel& data, MessageParcel& reply);
     void RevokePermissionInner(MessageParcel& data, MessageParcel& reply);
diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
index 296ee92d9..d4b38e196 100644
--- a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
+++ b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
@@ -195,8 +195,8 @@ int PermissionManager::GetReqPermissions(
     return RET_SUCCESS;
 }
 
-int PermissionManager::NeedDynamicPop(std::vector<PermissionStateFull> permsList,
-    PermissionListState &permState, bool &res)
+void PermissionManager::GetSelfPermissionState(std::vector<PermissionStateFull> permsList,
+    PermissionListState &permState)
 {
     bool foundGoal = false;
     int32_t goalGrantStatus;
@@ -210,22 +210,26 @@ int PermissionManager::NeedDynamicPop(std::vector<PermissionStateFull> permsList
         }
     }
     if (foundGoal == false) {
-        ACCESSTOKEN_LOG_ERROR(LABEL,
-            "can not find permission: %{public}s!", permState.permissionName.c_str());
-        return RET_FAILED;
+        ACCESSTOKEN_LOG_WARN(LABEL,
+            "can not find permission: %{public}s define!", permState.permissionName.c_str());
+        permState.state = DYNAMIC_OPER;
+        return;
     }
 
     if (goalGrantStatus == PERMISSION_DENIED) {
         if ((goalGrantFlags == DEFAULT_PERMISSION_FLAGS) ||
             (goalGrantFlags == PERMISSION_USER_SET)) {
-            permState.state = 1;
-            res = true;
-            return RET_SUCCESS;
+            permState.state = DYNAMIC_OPER;
+            return;
+        }
+        if (goalGrantFlags == PERMISSION_USER_FIXED) {
+            permState.state = SETTING_OPER;
+            return;
         }
     }
-    ACCESSTOKEN_LOG_INFO(LABEL, "do not need dynamic pop");
-    permState.state = 0;
-    return RET_SUCCESS;
+
+    permState.state = PASS_OPER;
+    return;
 }
 
 int PermissionManager::GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName)
diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
index aa7ea1b86..087dac7af 100644
--- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
+++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
@@ -21,6 +21,7 @@
 #include "accesstoken_log.h"
 #include "hap_token_info.h"
 #include "hap_token_info_inner.h"
+#include "ipc_skeleton.h"
 #include "native_token_info_inner.h"
 #include "native_token_receptor.h"
 #include "permission_list_state.h"
@@ -130,13 +131,15 @@ int AccessTokenManagerService::GetReqPermissions(
     return ret;
 }
 
-PermissionOper AccessTokenManagerService::GetPermissionsState(
-    AccessTokenID tokenID, std::vector<PermissionListStateParcel>& reqPermList)
+PermissionOper AccessTokenManagerService::GetSelfPermissionsState(
+    std::vector<PermissionListStateParcel>& reqPermList)
 {
-    ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called, id: 0x%{public}x", __func__, tokenID);
+    AccessTokenID callingTokenID = IPCSkeleton::GetCallingTokenID();
+    ACCESSTOKEN_LOG_INFO(LABEL, "callingTokenID: %{public}d", callingTokenID);
+
     bool needRes = false;
     std::vector<PermissionStateFull> permsList;
-    int ret = PermissionManager::GetInstance().GetReqPermissions(tokenID, permsList, false);
+    int ret = PermissionManager::GetInstance().GetReqPermissions(callingTokenID, permsList, false);
     if (ret != RET_SUCCESS) {
         return INVALID_OPER;
     }
@@ -144,9 +147,10 @@ PermissionOper AccessTokenManagerService::GetPermissionsState(
     int32_t size = reqPermList.size();
     ACCESSTOKEN_LOG_INFO(LABEL, "reqPermList size: 0x%{public}x", size);
     for (int32_t i = 0; i < size; i++) {
-        ret = PermissionManager::GetInstance().NeedDynamicPop(permsList, reqPermList[i].permsState, needRes);
-        if (ret != RET_SUCCESS) {
-            return INVALID_OPER;
+        PermissionManager::GetInstance().GetSelfPermissionState(
+            permsList, reqPermList[i].permsState);
+        if (reqPermList[i].permsState.state == DYNAMIC_OPER) {
+            needRes = true;
         }
     }
     if (needRes) {
diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
index db1cc29df..6b0067a5e 100644
--- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
+++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
@@ -114,11 +114,11 @@ void AccessTokenManagerStub::GetReqPermissionsInner(MessageParcel& data, Message
     reply.WriteInt32(result);
 }
 
-void AccessTokenManagerStub::GetPermissionsStateInner(MessageParcel& data, MessageParcel& reply)
+void AccessTokenManagerStub::GetSelfPermissionsStateInner(MessageParcel& data, MessageParcel& reply)
 {
     ACCESSTOKEN_LOG_INFO(LABEL, "called");
+
     std::vector<PermissionListStateParcel> permList;
-    AccessTokenID tokenID = data.ReadUint32();
     uint32_t size = data.ReadUint32();
     for (uint32_t i = 0; i < size; i++) {
         sptr<PermissionListStateParcel> permissionParcel = data.ReadParcelable<PermissionListStateParcel>();
@@ -127,13 +127,14 @@ void AccessTokenManagerStub::GetPermissionsStateInner(MessageParcel& data, Messa
         }
     }
 
-    PermissionOper result = this->GetPermissionsState(tokenID, permList);
+    PermissionOper result = this->GetSelfPermissionsState(permList);
+
+    reply.WriteInt32(result);
 
     reply.WriteUint32(permList.size());
     for (auto perm : permList) {
         reply.WriteParcelable(&perm);
     }
-    reply.WriteInt32(result);
 }
 
 void AccessTokenManagerStub::GetPermissionFlagInner(MessageParcel& data, MessageParcel& reply)
@@ -485,7 +486,7 @@ AccessTokenManagerStub::AccessTokenManagerStub()
     requestFuncMap_[static_cast<uint32_t>(IAccessTokenManager::InterfaceCode::DUMP_TOKENINFO)] =
         &AccessTokenManagerStub::DumpTokenInfoInner;
     requestFuncMap_[static_cast<uint32_t>(IAccessTokenManager::InterfaceCode::GET_PERMISSION_OPER_STATE)] =
-        &AccessTokenManagerStub::GetPermissionsStateInner;
+        &AccessTokenManagerStub::GetSelfPermissionsStateInner;
 }
 
 AccessTokenManagerStub::~AccessTokenManagerStub()
diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp
index aacac1416..19d7f2722 100644
--- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp
+++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp
@@ -93,10 +93,11 @@ AccessTokenID AccessTokenIDManager::CreateAndRegisterTokenId(ATokenTypeEnum type
         int ret = RegisterTokenId(tokenId, type);
         if (ret == RET_SUCCESS) {
             break;
-        } else if (i == MAX_CREATE_TOKEN_ID_RETRY - 1) {
+        } else if (i < MAX_CREATE_TOKEN_ID_RETRY - 1) {
             ACCESSTOKEN_LOG_INFO(LABEL, "reigster tokenId failed, maybe repeat, retry");
         } else {
             ACCESSTOKEN_LOG_WARN(LABEL, "reigster tokenId finally failed");
+            tokenId = 0;
         }
     }
     return tokenId;
-- 
Gitee