From 92ad768ad87adedff638f18fb8ec85f9ea412039 Mon Sep 17 00:00:00 2001 From: Jay Thomas Sullivan Date: Thu, 17 Mar 2022 12:11:27 -0700 Subject: [PATCH] Add media permissions to STORAGE_PERMISSIONS This list is used by revokeStoragePermissionsIfScopeExpandedInternal, and since sometimes the STORAGE group permissions expands to the media permissions as well, we should revoke all of them here. Bug: 201318587 Test: atest StorageEscalationTest Change-Id: Ieac30a3e8a8e90c5198f31769d1b0e626c03f79c --- .../server/pm/permission/PermissionManagerServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 d0609307e6a84..423c289448c99 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -222,6 +222,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt STORAGE_PERMISSIONS.add(Manifest.permission.READ_EXTERNAL_STORAGE); STORAGE_PERMISSIONS.add(Manifest.permission.WRITE_EXTERNAL_STORAGE); 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);