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

Commit 60cdf9c5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I9473adf7,I5ae04fc0 

* changes:
  Do not revoke, just deny when policy says so
  Persist changes to policy changed flags
parents be3c5432 142f6059

src/com/android/packageinstaller/permission/service/PermissionControllerServiceImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ public final class PermissionControllerServiceImpl extends PermissionControllerS 
                Collections.singletonList(unexpandedPermission),

                callerPkgInfo.applicationInfo.targetSdkVersion);



        AppPermissions app = new AppPermissions(this, pkgInfo, false, null);

        AppPermissions app = new AppPermissions(this, pkgInfo, false, true, null);



        int numPerms = expandedPermissions.size();

        for (int i = 0; i < numPerms; i++) {

src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java

+0 −3
Original line number Diff line number Diff line
@@ -184,9 +184,6 @@ public class GrantPermissionsActivity extends Activity 
            } break;



            case DevicePolicyManager.PERMISSION_POLICY_AUTO_DENY: {

                if (group.areRuntimePermissionsGranted()) {

                    group.revokeRuntimePermissions(false, new String[]{permission});

                }

                state.mState = GroupState.STATE_DENIED;

                group.setPolicyFixed();

                skipGroup = true;