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

Commit 947fe79e authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 483 into donut 

* changes:
  API_CHANGE: external_storage: Add SDCARD_WRITE permission with associated strings
parents 0a57e5b7 29b57e63

api/current.xml

+23 −1
Original line number Diff line number Diff line
@@ -848,6 +848,17 @@ 
 visibility="public"

>

</field>

<field name="SDCARD_WRITE"

 type="java.lang.String"

 transient="false"

 volatile="false"

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

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SEND_SMS"

 type="java.lang.String"

 transient="false"
@@ -1283,6 +1294,17 @@ 
 visibility="public"

>

</field>

<field name="STORAGE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.permission-group.STORAGE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SYSTEM_TOOLS"

 type="java.lang.String"

 transient="false"
@@ -58025,7 +58047,7 @@ 
 type="float"

 transient="false"

 volatile="false"

 value="0.0010f"

 value="0.001f"

 static="true"

 final="true"

 deprecated="not deprecated"

core/res/AndroidManifest.xml

+17 −0
Original line number Diff line number Diff line
@@ -366,6 +366,23 @@ 
        android:label="@string/permlab_readPhoneState"

        android:description="@string/permdesc_readPhoneState" />



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

    <!-- Permissions for sdcard interaction -->

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

    <eat-comment />



    <!-- Group of permissions that are related to SD card access. -->

    <permission-group android:name="android.permission-group.STORAGE"

        android:label="@string/permgrouplab_storage"

        android:description="@string/permgroupdesc_storage" />



    <!-- Allows an application to write to the SD card -->

    <permission android:name="android.permission.SDCARD_WRITE"

        android:permissionGroup="android.permission-group.STORAGE"

        android:label="@string/permlab_sdcardWrite"

        android:description="@string/permdesc_sdcardWrite"

        android:protectionLevel="normal" />



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

    <!-- Permissions for low-level system interaction -->

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

core/res/res/values/strings.xml

+10 −0
Original line number Diff line number Diff line
@@ -335,6 +335,11 @@ 
    <string name="permgroupdesc_developmentTools">Features only needed for

        application developers.</string>



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

    <string name="permgrouplab_storage">Storage</string>

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

    <string name="permgroupdesc_storage">Access the SD card.</string>



    <!--  Permissions -->



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -1045,6 +1050,11 @@ 
    <string name="permdesc_writeDictionary">Allows an application to write new words into the

      user dictionary.</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_sdcardWrite">write to SD card</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_sdcardWrite">Allows an application to write to the SD card.</string>



    <!-- The order of these is important, don't reorder without changing Contacts.java --> <skip />

    <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->

    <string-array name="phoneTypes">

data/etc/platform.xml

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ 
        <group gid="log" />

    </permission>



    <permission name="android.permission.SDCARD_WRITE" >

        <group gid="sdcard_rw" />

    </permission>



    <!-- The group that /cache belongs to, linked to the permission

         set on the applications that can access /cache -->

    <permission name="android.permission.ACCESS_CACHE_FILESYSTEM" >