From 6bef01b409e8b8c60e0e1b93fa5bd19028e2db5e Mon Sep 17 00:00:00 2001
From: zhouyan <zhouyan128@huawei.com>
Date: Mon, 1 Aug 2022 11:08:37 +0800
Subject: [PATCH] =?UTF-8?q?access=5Ftoken=E5=B9=B6=E5=85=A5foundation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhouyan <zhouyan128@huawei.com>
Change-Id: I5ff68de4e9a0b2fdb9d35a5870d837bea131b6d4
---
 services/accesstokenmanager/BUILD.gn          |  8 -------
 services/accesstokenmanager/access_token.cfg  | 19 ----------------
 services/accesstokenmanager/access_token.rc   | 22 -------------------
 .../main/sa_profile/3503.xml                  |  2 +-
 services/privacymanager/sa_profile/3505.xml   |  2 +-
 5 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 services/accesstokenmanager/access_token.cfg
 delete mode 100644 services/accesstokenmanager/access_token.rc

diff --git a/services/accesstokenmanager/BUILD.gn b/services/accesstokenmanager/BUILD.gn
index 116041ae5..4b977d4e3 100644
--- a/services/accesstokenmanager/BUILD.gn
+++ b/services/accesstokenmanager/BUILD.gn
@@ -14,13 +14,6 @@
 import("//base/security/access_token/access_token.gni")
 import("//build/ohos.gni")
 
-ohos_prebuilt_etc("access_token.rc") {
-  source = "access_token.cfg"
-  relative_install_dir = "init"
-  subsystem_name = "security"
-  part_name = "access_token"
-}
-
 if (is_standard_system) {
   ohos_shared_library("accesstoken_manager_service") {
     subsystem_name = "security"
@@ -80,7 +73,6 @@ if (is_standard_system) {
       "//base/security/access_token/frameworks/accesstoken:accesstoken_communication_adapter_cxx",
       "//base/security/access_token/frameworks/common:accesstoken_common_cxx",
       "//base/security/access_token/interfaces/innerkits/privacy:libprivacy_sdk",
-      "//base/security/access_token/services/accesstokenmanager:access_token.rc",
       "//base/security/access_token/services/common/database:accesstoken_database_cxx",
     ]
 
diff --git a/services/accesstokenmanager/access_token.cfg b/services/accesstokenmanager/access_token.cfg
deleted file mode 100644
index fc617a465..000000000
--- a/services/accesstokenmanager/access_token.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "jobs" : [{
-            "name" : "pre-init",
-            "cmds" : [
-                "mkdir /data/service/el0/access_token 0750 root access_token",
-                "load_access_token_id "
-            ]
-        }
-    ],
-    "services" : [{
-            "name" : "accesstoken_service",
-            "path" : ["/system/bin/sa_main", "/system/profile/accesstoken_service.xml"],
-            "importance" : -20,
-            "uid" : "access_token",
-            "gid" : ["access_token"],
-            "secon" : "u:r:accesstoken_service:s0"
-        }
-    ]
-}
diff --git a/services/accesstokenmanager/access_token.rc b/services/accesstokenmanager/access_token.rc
deleted file mode 100644
index 15ff9d773..000000000
--- a/services/accesstokenmanager/access_token.rc
+++ /dev/null
@@ -1,22 +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.
-
-on late-fs
-    start accesstoken_service
-
-service accesstoken_service /system/bin/sa_main /system/profile/accesstoken_service.xml
-    class accesstoken_service
-    priority -20
-    user access_token
-    group access_token
-    seclabel u:r:accesstoken_service:s0
diff --git a/services/accesstokenmanager/main/sa_profile/3503.xml b/services/accesstokenmanager/main/sa_profile/3503.xml
index b56ef0380..f804325a9 100644
--- a/services/accesstokenmanager/main/sa_profile/3503.xml
+++ b/services/accesstokenmanager/main/sa_profile/3503.xml
@@ -13,7 +13,7 @@
      limitations under the License.
 -->
 <info>
-    <process>accesstoken_service</process>
+    <process>foundation</process>
     <systemability>
         <name>3503</name>
         <libpath>libaccesstoken_manager_service.z.so</libpath>
diff --git a/services/privacymanager/sa_profile/3505.xml b/services/privacymanager/sa_profile/3505.xml
index 60b5eae50..0c81dc013 100644
--- a/services/privacymanager/sa_profile/3505.xml
+++ b/services/privacymanager/sa_profile/3505.xml
@@ -18,7 +18,7 @@
         <name>3505</name>
         <libpath>libprivacy_manager_service.z.so</libpath>
         <run-on-create>true</run-on-create>
-        <distributed>true</distributed>
+        <distributed>false</distributed>
         <dump-level>1</dump-level>
     </systemability>
 </info>
-- 
Gitee