commit b508ee450f60ed55a7f3893e5c7e28cefa8b866a
author Jay Thomas Sullivan <jaysullivan@google.com> Wed Apr 13 15:26:14 2022 -0700
committer Jay Sullivan <jaysullivan@google.com> Thu Apr 14 16:52:58 2022 +0000
tree 6976ed0c46499dd9e659923487c279e8922b9854
parent dd7c5737a4e51021ad07e1e21303a325f050862c

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

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

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 849f530..349174d 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 @@
         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<String> NEARBY_DEVICES_PERMISSIONS = new ArraySet<>();