summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-12-13 23:36:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-12-13 23:36:32 +0000
commit066f0314793d7beac785d0bd736eb01de88c3f97 (patch)
tree47859338567ecd6cefbce9425424cb6971e049dd
parentcadc75a3cb920fc2acd675ea9e9643d063743e9e (diff)
parentb875116b6651c3835e941c8bd3803a676a05057c (diff)
Merge "Grant removed install permissions"
-rw-r--r--services/core/java/com/android/server/pm/permission/PermissionManagerService.java7
1 files changed, 2 insertions, 5 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 31f5ce47abd9..b58c811645f7 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -799,10 +799,6 @@ public class PermissionManagerService {
continue;
}
- if (bp.isRemoved()) {
- continue;
- }
-
// Limit ephemeral apps to ephemeral allowed permissions.
if (pkg.applicationInfo.isInstantApp() && !bp.isInstant()) {
if (DEBUG_PERMISSIONS) {
@@ -951,7 +947,8 @@ public class PermissionManagerService {
// how to disable the API to simulate revocation as legacy
// apps don't expect to run with revoked permissions.
if (PLATFORM_PACKAGE_NAME.equals(bp.getSourcePackageName())) {
- if ((flags & FLAG_PERMISSION_REVIEW_REQUIRED) == 0) {
+ if ((flags & FLAG_PERMISSION_REVIEW_REQUIRED) == 0
+ && !bp.isRemoved()) {
flags |= FLAG_PERMISSION_REVIEW_REQUIRED;
// We changed the flags, hence have to write.
updatedUserIds = ArrayUtils.appendInt(