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

Commit b2659700 authored by Nate Myren's avatar Nate Myren
Browse files

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
parent 73ffe99b

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

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