From b2659700af40dd34c7e34ab470c2fae63096a32b Mon Sep 17 00:00:00 2001
From: Nate Myren <ntmyren@google.com>
Date: Fri, 9 Jul 2021 18:21:52 -0700
Subject: [PATCH] Do not clear REVOKED_COMPAT for pre-S NEARBY_DEVICES

These flags should instead be cleared for the nearby devices permission
of pre-S apps, until the app upgrades to android S

Test: manual
Bug: 192426650
Change-Id: I14a53ed5d17772afda8f765b6293a9e3311f4a7a
---
 .../server/pm/permission/PermissionManagerService.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 30ddbb60080f7..97ccfe6e7b2c6 100644
--- 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.