Merge "Do not clear REVOKED_COMPAT for pre-S NEARBY_DEVICES" into sc-dev

2021-07-13 19:59:15 +00:00
parent 51204c444a b2659700af
commit 9900f4b247
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -2920,7 +2920,9 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                                wasChanged = true;
                            }

-                            if ((flags & FLAG_PERMISSION_REVOKED_COMPAT) != 0) {
+                            if ((flags & FLAG_PERMISSION_REVOKED_COMPAT) != 0
+                                    && !isPermissionSplitFromNonRuntime(permName,
+                                    pkg.getTargetSdkVersion())) {
                                flags &= ~FLAG_PERMISSION_REVOKED_COMPAT;
                                wasChanged = true;
                            // Hard restricted permissions cannot be held.