From d2a49af61817a79fec4a9a21f980c87746c7f07c Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Fri, 22 Apr 2022 15:28:03 +0000 Subject: [PATCH] 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 --- .../PermissionManagerServiceImpl.java | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) 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 54656c5e26287..423c289448c99 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 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt /** All storage permissions */ private static final List STORAGE_PERMISSIONS = new ArrayList<>(); - - private static final Set READ_MEDIA_AURAL_PERMISSIONS = new ArraySet<>(); - - private static final Set READ_MEDIA_VISUAL_PERMISSIONS = new ArraySet<>(); - /** All nearby devices permissions */ private static final List NEARBY_DEVICES_PERMISSIONS = new ArrayList<>(); @@ -226,10 +221,10 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 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 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 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 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt } 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);