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

Commit 3b7becf0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Reset any non-runtime permissions with user sensitive"" into rvc-dev am: ceeef843 

Change-Id: Ia0025508d1bcbdd94a6620385bdf6f8f71f323c5
parents bf091732 ceeef843

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

+0 −14
Original line number Diff line number Diff line
@@ -2499,24 +2499,10 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
        synchronized (mLock) {

            ArraySet<String> newImplicitPermissions = new ArraySet<>();



            // TODO ntmyren: Remove once propagated to droidfood

            int flagMask = PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED

                    | PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED;

            int user = UserHandle.getUserId(pkg.getUid());



            final int N = pkg.getRequestedPermissions().size();

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

                final String permName = pkg.getRequestedPermissions().get(i);

                final BasePermission bp = mSettings.getPermissionLocked(permName);



                // TODO ntmyren: Remove once propagated to droidfood

                if (bp != null && !bp.isRuntime()) {

                    PermissionState permState = permissionsState.getInstallPermissionState(bp.name);

                    if (permState == null || (permState.getFlags() & flagMask) != 0) {

                        permissionsState.updatePermissionFlags(bp, user, flagMask, 0);

                    }

                }



                final boolean appSupportsRuntimePermissions =

                        pkg.getTargetSdkVersion() >= Build.VERSION_CODES.M;

                String upgradedActivityRecognitionPermission = null;