diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-04-22 07:05:21 -0700 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-05-03 21:03:56 -0400 |
| commit | f60ba87f075eb7bd278bc14af77ba41c70b2f8b0 (patch) | |
| tree | eb4a236ce7588ebf9c0e0b7e99dc541004ef917e | |
| parent | 7ae938be1b4fb8938f0f438cfd611cd9ed0da513 (diff) | |
| download | frameworks_base-f60ba87f075eb7bd278bc14af77ba41c70b2f8b0.zip frameworks_base-f60ba87f075eb7bd278bc14af77ba41c70b2f8b0.tar.gz frameworks_base-f60ba87f075eb7bd278bc14af77ba41c70b2f8b0.tar.bz2 | |
DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
We need this to allow MTP to access secondary external storage devices
This reverts commit 35a2ea2fbf156a503d1b0bc6ca7784e51e2462f4.
Conflicts:
data/etc/platform.xml
Change-Id: I0b139a0f3b369c1080831a5b3a48f5d9a330b1bb
Signed-off-by: Mike Lockwood <lockwood@android.com>
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | data/etc/platform.xml | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index c684e7e..2f431c4 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -544,6 +544,14 @@ android:description="@string/permdesc_sdcardWrite" android:protectionLevel="dangerous" /> + <!-- Allows an application to write to internal media storage + @hide --> + <permission android:name="android.permission.WRITE_MEDIA_STORAGE" + android:permissionGroup="android.permission-group.STORAGE" + android:label="@string/permlab_mediaStorageWrite" + android:description="@string/permdesc_mediaStorageWrite" + android:protectionLevel="signatureOrSystem" /> + <!-- ============================================ --> <!-- Permissions for low-level system interaction --> <!-- ============================================ --> diff --git a/data/etc/platform.xml b/data/etc/platform.xml index df80546..1870a4a 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -58,6 +58,10 @@ <group gid="sdcard_rw" /> </permission> + <permission name="android.permission.WRITE_MEDIA_STORAGE" > + <group gid="media_rw" /> + </permission> + <permission name="android.permission.ACCESS_MTP" > <group gid="mtp" /> </permission> |