Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2160a04 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Add new WRITE_MEDIA_STORAGE permission to control write access to /data/media"

parents c3cb9f2e 3f425a6b

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -1255,6 +1255,17 @@ 
 visibility="public"

>

</field>

<field name="WRITE_MEDIA_STORAGE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.permission.WRITE_MEDIA_STORAGE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="WRITE_SECURE_SETTINGS"

 type="java.lang.String"

 transient="false"

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -532,6 +532,13 @@ 
        android:description="@string/permdesc_sdcardWrite"

        android:protectionLevel="dangerous" />



    <!-- Allows an application to write to internal media storage -->

    <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 -->

    <!-- ============================================ -->

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -1230,6 +1230,11 @@ 
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_sdcardWrite" product="default">Allows an application to write to the SD card.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_mediaStorageWrite" product="default">modify/delete internal media storage contents</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_mediaStorageWrite" product="default">Allows an application to modify the contents of the internal media storage.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_cache_filesystem">access the cache filesystem</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

data/etc/platform.xml

+4 −0
Original line number Diff line number Diff line
@@ -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_USB" >

        <group gid="usb" />

    </permission>