summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hai Zhang <zhanghai@google.com> 2021-03-28 20:13:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-03-28 20:13:42 +0000
commitf950d0f0146b0b5343950d8e43fc2239dcb28674 (patch)
tree3544c7423359ee478b6fd6ab6087169d2ed6dedf
parente713ee6c603cba0b3182d887ea2013a9e5706d82 (diff)
parent4b1c811914a51ec49fcfb73736a2a04ae49c0675 (diff)
Merge "Remove unnecessary check for permissions from system config in isPermissionSplitFromNonRuntime()." into sc-dev
-rw-r--r--services/core/java/com/android/server/pm/permission/PermissionManagerService.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index 0eccf3e4bc8d..920d044989a0 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -1849,8 +1849,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
synchronized (mLock) {
final Permission perm =
mRegistry.getPermission(splitPerm.getSplitPermission());
- return perm != null && perm.getType() != Permission.TYPE_CONFIG
- && !perm.isRuntime();
+ return perm != null && !perm.isRuntime();
}
}
}