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

Commit 9900f4b2 authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

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

parents 51204c44 b2659700

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

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