commit d2a49af61817a79fec4a9a21f980c87746c7f07c
author Greg Kaiser <gkaiser@google.com> Fri Apr 22 15:28:03 2022 +0000
committer Greg Kaiser <gkaiser@google.com> Fri Apr 22 15:28:03 2022 +0000
tree b21f4e7cf16c374fe5b5493ae2538ec526422578
parent 3fd4c55d6da41ec66ae8b26e358408c9c6366ff2

Revert "Don't re-prompt for VISUAL/AURAL after app upgrade"

This reverts commit 3fd4c55d6da41ec66ae8b26e358408c9c6366ff2.

Reason for revert: Fatal exception
Bug: b/230095156

Change-Id: I5a3220a2d9466f8fbcd07840282b2c47f566e154

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

diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
index 54656c5..423c289 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -194,11 +194,6 @@
 
     /** All storage permissions */
     private static final List<String> STORAGE_PERMISSIONS = new ArrayList<>();
-
-    private static final Set<String> READ_MEDIA_AURAL_PERMISSIONS = new ArraySet<>();
-
-    private static final Set<String> READ_MEDIA_VISUAL_PERMISSIONS = new ArraySet<>();
-
     /** All nearby devices permissions */
     private static final List<String> NEARBY_DEVICES_PERMISSIONS = new ArrayList<>();
 
@@ -226,10 +221,10 @@
                 Manifest.permission.INTERACT_ACROSS_USERS_FULL);
         STORAGE_PERMISSIONS.add(Manifest.permission.READ_EXTERNAL_STORAGE);
         STORAGE_PERMISSIONS.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
-        READ_MEDIA_AURAL_PERMISSIONS.add(Manifest.permission.READ_MEDIA_AUDIO);
-        READ_MEDIA_VISUAL_PERMISSIONS.add(Manifest.permission.READ_MEDIA_VIDEO);
-        READ_MEDIA_VISUAL_PERMISSIONS.add(Manifest.permission.READ_MEDIA_IMAGES);
-        READ_MEDIA_VISUAL_PERMISSIONS.add(Manifest.permission.ACCESS_MEDIA_LOCATION);
+        STORAGE_PERMISSIONS.add(Manifest.permission.ACCESS_MEDIA_LOCATION);
+        STORAGE_PERMISSIONS.add(Manifest.permission.READ_MEDIA_AUDIO);
+        STORAGE_PERMISSIONS.add(Manifest.permission.READ_MEDIA_IMAGES);
+        STORAGE_PERMISSIONS.add(Manifest.permission.READ_MEDIA_VIDEO);
         NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.BLUETOOTH_ADVERTISE);
         NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.BLUETOOTH_CONNECT);
         NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.BLUETOOTH_SCAN);
@@ -2088,10 +2083,7 @@
                 PermissionInfo permInfo = getPermissionInfo(
                         newPackage.getRequestedPermissions().get(i),
                         newPackage.getPackageName(), 0);
-                boolean isStorageOrMedia = STORAGE_PERMISSIONS.contains(permInfo.name)
-                        || READ_MEDIA_AURAL_PERMISSIONS.contains(permInfo.name)
-                        || READ_MEDIA_VISUAL_PERMISSIONS.contains(permInfo.name);
-                if (permInfo == null || !isStorageOrMedia) {
+                if (permInfo == null || !STORAGE_PERMISSIONS.contains(permInfo.name)) {
                     continue;
                 }
 
@@ -3158,9 +3150,7 @@
                 }
                 if (bp.isRuntime()) {
 
-                    if (!(newPerm.equals(Manifest.permission.ACTIVITY_RECOGNITION)
-                            || READ_MEDIA_AURAL_PERMISSIONS.contains(newPerm)
-                            || READ_MEDIA_VISUAL_PERMISSIONS.contains(newPerm))) {
+                    if (!newPerm.equals(Manifest.permission.ACTIVITY_RECOGNITION)) {
                         ps.updatePermissionFlags(bp,
                                 FLAG_PERMISSION_REVOKE_WHEN_REQUESTED,
                                 FLAG_PERMISSION_REVOKE_WHEN_REQUESTED);