Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bdaaf76 authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: Ica8423d6d2250f5b07a002f6512c40bc88527464
parents e9a97c75 48ee3513

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -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.