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

Commit 22a6b80e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't reset permission granted by role." into rvc-dev am: f37bed75... 

Merge "Don't reset permission granted by role." into rvc-dev am: f37bed75 am: e5124bc9 am: 2b6615f1 am: 27c396a3

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

Change-Id: Ib0cb7f017c4482a662fa66eb70f50e1f02635503
parents 3862b3d7 27c396a3

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

+4 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.content.pm.ApplicationInfo.AUTO_REVOKE_DISCOURAGED; 
import static android.content.pm.PackageManager.FLAGS_PERMISSION_RESTRICTION_ANY_EXEMPT;

import static android.content.pm.PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION;

import static android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT;

import static android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_ROLE;

import static android.content.pm.PackageManager.FLAG_PERMISSION_ONE_TIME;

import static android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED;

import static android.content.pm.PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED;
@@ -1804,8 +1805,9 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
                continue;

            }



            // If this permission was granted by default, make sure it is.

            if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0) {

            // If this permission was granted by default or role, make sure it is.

            if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0

                    || (oldFlags & FLAG_PERMISSION_GRANTED_BY_ROLE) != 0) {

                // PermissionPolicyService will handle the app op for runtime permissions later.

                grantRuntimePermissionInternal(permName, packageName, false,

                        Process.SYSTEM_UID, userId, delayingPermCallback);