commit 85d9b31a13614c99146e8ebdae812054cac79c0a
author Jeff Sharkey <jsharkey@google.com> Fri Jan 25 04:20:27 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 25 04:20:27 2019 +0000
tree 7c04eaf38f7f19d647fa736a6c359eb8c3298dd1
parent eeb75cd2bb8dcc4d7adc8db905ec87e0b937a9bf
parent 87a5616161a2dc2f629bac719f2c27c3349fec1a

Merge "Verify permissions are only held by media stack."

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 8e638fd..0f2ba12 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -11,6 +11,7 @@
     field public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";
     field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";
     field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS";
+    field public static final String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE";
     field public static final String WRITE_OBB = "android.permission.WRITE_OBB";
   }
 

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index f92df6a..4a54bd7 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2119,7 +2119,7 @@
     <!-- ================================== -->
     <eat-comment />
 
-    <!-- @SystemApi Allows an application to write to internal media storage
+    <!-- @SystemApi @TestApi Allows an application to write to internal media storage
          @hide  -->
     <permission android:name="android.permission.WRITE_MEDIA_STORAGE"
         android:protectionLevel="signature|privileged" />