diff options
| author | 2021-05-11 17:38:19 +0000 | |
|---|---|---|
| committer | 2021-05-11 17:38:19 +0000 | |
| commit | e7f4abd086e366720ed482591837bf0b78c0fb89 (patch) | |
| tree | 762c8cc2e0a2f3d6a9258856a47febb02b759c23 | |
| parent | e3eea0e2a57eae65dd83764755dc40b3bd02737d (diff) | |
| parent | f4d57c090dc383c18ad35b4cf9e959e168846776 (diff) | |
Merge "Add a UWB subsystem uid" into sc-dev
| -rw-r--r-- | core/java/android/os/Process.java | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index f9e4f733e94b..6bca336dae91 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -250,6 +250,12 @@ public class Process { public static final int EXT_OBB_RW_GID = 1079; /** + * Defines the UID/GID for the Uwb service process. + * @hide + */ + public static final int UWB_UID = 1083; + + /** * GID that corresponds to the INTERNET permission. * Must match the value of AID_INET. * @hide diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index fc36378a9447..679042ff40c9 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -557,6 +557,7 @@ public class PackageManagerService extends IPackageManager.Stub private static final int SHELL_UID = Process.SHELL_UID; private static final int SE_UID = Process.SE_UID; private static final int NETWORKSTACK_UID = Process.NETWORK_STACK_UID; + private static final int UWB_UID = Process.UWB_UID; static final int SCAN_NO_DEX = 1 << 0; static final int SCAN_UPDATE_SIGNATURE = 1 << 1; @@ -6313,6 +6314,8 @@ public class PackageManagerService extends IPackageManager.Stub ApplicationInfo.FLAG_SYSTEM, ApplicationInfo.PRIVATE_FLAG_PRIVILEGED); mSettings.addSharedUserLPw("android.uid.networkstack", NETWORKSTACK_UID, ApplicationInfo.FLAG_SYSTEM, ApplicationInfo.PRIVATE_FLAG_PRIVILEGED); + mSettings.addSharedUserLPw("android.uid.uwb", UWB_UID, + ApplicationInfo.FLAG_SYSTEM, ApplicationInfo.PRIVATE_FLAG_PRIVILEGED); t.traceEnd(); String separateProcesses = SystemProperties.get("debug.separate_processes"); |