From b508ee450f60ed55a7f3893e5c7e28cefa8b866a Mon Sep 17 00:00:00 2001 From: Jay Thomas Sullivan Date: Wed, 13 Apr 2022 15:26:14 -0700 Subject: [PATCH] Add media perms to DefaultPermissionGrantPolicy For T, we recently added new permissions: - READ_MEDIA_AUDIO - READ_MEDIA_VIDEO - READ_MEDIA_IMAGES But, we failed to update DefaultPermissionGrantPolicy(+Test), and therefore no pre-grants are being given for the new permissions. After discussion, it was decided that any existing pre-grants for STORAGE should be extended to these new permissions. Bug: 229150830 Test: atest DefaultPermissionGrantPolicyTest Change-Id: I7367c5981196b3c7988a835359b4e8d27b52b074 --- .../server/pm/permission/DefaultPermissionGrantPolicy.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java index 849f53026c991..349174d95ec42 100644 --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java @@ -207,6 +207,9 @@ final class DefaultPermissionGrantPolicy { 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_VIDEO); + STORAGE_PERMISSIONS.add(Manifest.permission.READ_MEDIA_IMAGES); } private static final Set NEARBY_DEVICES_PERMISSIONS = new ArraySet<>();