Merge "Grant the default gallery app storage permissions" into mnc-dev

1 files changed, 10 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
index cb65b75..e459e26 100644
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -452,6 +452,16 @@ final class DefaultPermissionGrantPolicy {
                 grantRuntimePermissionsLPw(mapsPackage, LOCATION_PERMISSIONS, userId);
             }
 
+            // Gallery
+            Intent galleryIntent = new Intent(Intent.ACTION_MAIN);
+            galleryIntent.addCategory(Intent.CATEGORY_APP_GALLERY);
+            PackageParser.Package galleryPackage = getDefaultSystemHandlerActivityPackageLPr(
+                    galleryIntent, userId);
+            if (galleryPackage != null
+                    && doesPackageSupportRuntimePermissions(galleryPackage)) {
+                grantRuntimePermissionsLPw(galleryPackage, STORAGE_PERMISSIONS, userId);
+            }
+
             // Email
             Intent emailIntent = new Intent(Intent.ACTION_MAIN);
             emailIntent.addCategory(Intent.CATEGORY_APP_EMAIL);