diff options
| author | 2020-01-23 05:44:57 +0000 | |
|---|---|---|
| committer | 2020-01-23 05:44:57 +0000 | |
| commit | 0e6396500b6b204f55055346d14a9b58800bad94 (patch) | |
| tree | 88ebbabb1b792db3d09e7185acb34131ea708344 | |
| parent | e4b7a310c6e32e8db44ae9ee457051e28ed1908c (diff) | |
| parent | 7da9f80d6a7d76d7cac5c6220678d8a46cd8e14d (diff) | |
Merge "Deprecate WRITE_MEDIA_STORAGE permission"
| -rwxr-xr-x | api/system-current.txt | 3 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | data/etc/platform.xml | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index b0b592fa44bc..08c67539be65 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -233,7 +233,7 @@ package android { field public static final String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG"; field public static final String WRITE_DREAM_STATE = "android.permission.WRITE_DREAM_STATE"; field public static final String WRITE_EMBEDDED_SUBSCRIPTIONS = "android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"; - field public static final String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE"; + field @Deprecated public static final String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE"; field public static final String WRITE_OBB = "android.permission.WRITE_OBB"; } @@ -14189,4 +14189,3 @@ package android.webkit { } } - diff --git a/api/test-current.txt b/api/test-current.txt index 52f307fd50b6..f179d879aeea 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -19,7 +19,7 @@ package android { field public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS"; field public static final String TEST_MANAGE_ROLLBACKS = "android.permission.TEST_MANAGE_ROLLBACKS"; field public static final String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG"; - field public static final String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE"; + field @Deprecated public static final String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE"; field public static final String WRITE_OBB = "android.permission.WRITE_OBB"; } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 5d9367f3807e..1fb08f260393 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2253,6 +2253,9 @@ <eat-comment /> <!-- @SystemApi @TestApi Allows an application to write to internal media storage + @deprecated This permission is no longer honored in the system and no longer adds + the media_rw gid as a supplementary gid to the holder. Use the + android.permission.MANAGE_EXTERNAL_STORAGE instead. @hide --> <permission android:name="android.permission.WRITE_MEDIA_STORAGE" android:protectionLevel="signature|privileged" /> diff --git a/data/etc/platform.xml b/data/etc/platform.xml index 877ef2687349..0541db121ae6 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -60,10 +60,6 @@ <group gid="log" /> </permission> - <permission name="android.permission.WRITE_MEDIA_STORAGE" > - <group gid="media_rw" /> - </permission> - <permission name="android.permission.ACCESS_MTP" > <group gid="mtp" /> </permission> |