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

Browse Source
This commit is contained in:
Nate Myren
2021-07-13 19:59:15 +00:00
committed by Android (Google) Code Review
parent 51204c444a b2659700af
commit 9900f4b247
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

@@ -2920,7 +2920,9 @@ public class PermissionManagerService extends IPermissionManager.Stub {
wasChanged = true; 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; flags &= ~FLAG_PERMISSION_REVOKED_COMPAT;
wasChanged = true; wasChanged = true;
// Hard restricted permissions cannot be held. // Hard restricted permissions cannot be held.