commit 7fb699567b05f7c93cb67d5e41b73b0357eafe7b
author Nate Myren <ntmyren@google.com> Fri Apr 24 19:56:48 2020 +0000
committer Nate Myren <ntmyren@google.com> Mon Apr 27 21:22:45 2020 +0000
tree ba5cec49b1a5093ce913fa4d3ccfd02c0d6e50ce
parent c690062ee1e6f192b8239b7c8998e5f34d1c9ba0

Revert "Reset any non-runtime permissions with user sensitive"

This reverts commit c690062ee1e6f192b8239b7c8998e5f34d1c9ba0.

Reason for revert: Has propagated through droidfood. Flags are repaired
Bug: 6355618

Change-Id: If7718fe1631e98569c25bfd7b3a6b07162e621b9

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

diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index b7c9ecb..82c02a4 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -2497,24 +2497,10 @@
         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;