commit d7ae5033fe57a9a26c32435a3b333d48840df5df
author Philip P. Moltmann <moltmann@google.com> Wed Mar 27 12:25:37 2019 -0700
committer Philip P. Moltmann <moltmann@google.com> Mon Apr 01 10:09:18 2019 -0700
tree 4596c0b0b45d894bcbe29458e1057ce4a7fa2507
parent 033e7d9ff1aba61b5c54b51ddcca50c8c330d88f

Do not use typed media permissins anymore

Test: None
Change-Id: I7c01b539816db5e8d38025a5f78d8134b19a89ca

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d075d75..d0b87c9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,12 +16,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.USE_RESERVED_DISK" />
 
-    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
-    <uses-permission android:name="android.permission.WRITE_MEDIA_AUDIO" />
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
-    <uses-permission android:name="android.permission.WRITE_MEDIA_VIDEO" />
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.WRITE_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
             android:process="android.process.media"

src/com/android/providers/media/MediaProvider.java

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index b7d4d51..d6c581f 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -5391,9 +5391,6 @@
         final String type = uri.getPathSegments().get(1);
         final String groupName;
         switch (type) {
-            case "audio": groupName = android.Manifest.permission_group.MEDIA_AURAL; break;
-            case "video": groupName = android.Manifest.permission_group.MEDIA_VISUAL; break;
-            case "image": groupName = android.Manifest.permission_group.MEDIA_VISUAL; break;
             default: groupName = android.Manifest.permission_group.STORAGE; break;
         }
         try {