Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not clear REVOKED_COMPAT for pre-S NEARBY_DEVICES" into sc-dev am: 9900f4b247 am: 48ee3513d1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15248112

Change-Id: Ica8423d6d2250f5b07a002f6512c40bc88527464
This commit is contained in:
Nate Myren
2021-07-13 21:15:22 +00:00
committed by Automerger Merge Worker
parent e9a97c7589 48ee3513d1
commit 0bdaaf761b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -2921,7 +2921,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.