Allow holders of WRITE_MEDIA_STORAGE to write to secondary external storage

Apps with WRITE_MEDIA_STORAGE can write to the secondary
external storage directly so there is no need to prevent
that through the MediaProvider.

Change-Id: If092fcdf0b90599afdb52a8e6ae4c7ba1090acc4

1 files changed, 16 insertions, 5 deletions

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 7e8d6867..89b6938f 100755
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -19,6 +19,7 @@ package com.android.providers.media;
 import static android.Manifest.permission.ACCESS_CACHE_FILESYSTEM;
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
 import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
+import static android.Manifest.permission.WRITE_MEDIA_STORAGE;
 import static android.os.ParcelFileDescriptor.MODE_READ_ONLY;
 import static android.os.ParcelFileDescriptor.MODE_WRITE_ONLY;
 
@@ -4643,15 +4644,25 @@ public class MediaProvider extends ContentProvider {
                 c.enforceCallingOrSelfPermission(
                         ACCESS_CACHE_FILESYSTEM, "Cache path: " + path);
             }
-        } else if (isWrite) {
-            // don't write to non-cache, non-sdcard files.
-            throw new FileNotFoundException("Can't access " + file);
         } else if (isSecondaryExternalPath(path)) {
             // read access is OK with the appropriate permission
             if (!readGranted) {
-                c.enforceCallingOrSelfPermission(
-                        READ_EXTERNAL_STORAGE, "External path: " + path);
+                if (c.checkCallingOrSelfPermission(WRITE_MEDIA_STORAGE)
+                        == PackageManager.PERMISSION_DENIED) {
+                    c.enforceCallingOrSelfPermission(
+                            READ_EXTERNAL_STORAGE, "External path: " + path);
+                }
+            }
+            if (isWrite) {
+                if (c.checkCallingOrSelfUriPermission(uri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+                        != PackageManager.PERMISSION_GRANTED) {
+                    c.enforceCallingOrSelfPermission(
+                            WRITE_MEDIA_STORAGE, "External path: " + path);
+                }
             }
+        } else if (isWrite) {
+            // don't write to non-cache, non-sdcard files.
+            throw new FileNotFoundException("Can't access " + file);
         } else {
             checkWorldReadAccess(path);
         }