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

Commit 7c49790c authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 162c9d0e: Merge change 2805 into donut 

Merge commit '162c9d0e'

* commit '162c9d0e':
  base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
parents 4599184a 162c9d0e

api/current.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -1167,11 +1167,11 @@ 
 visibility="public"

 visibility="public"

>

>

</field>

</field>

<field name="WRITE_SDCARD"

<field name="WRITE_EXTERNAL_STORAGE"

 type="java.lang.String"

 type="java.lang.String"

 transient="false"

 transient="false"

 volatile="false"

 volatile="false"

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

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

 static="true"

 static="true"

 final="true"

 final="true"

 deprecated="not deprecated"

 deprecated="not deprecated"

core/java/android/content/pm/PackageParser.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ public class PackageParser { 
     */

     */

    public static final PackageParser.NewPermissionInfo NEW_PERMISSIONS[] =

    public static final PackageParser.NewPermissionInfo NEW_PERMISSIONS[] =

        new PackageParser.NewPermissionInfo[] {

        new PackageParser.NewPermissionInfo[] {

            new PackageParser.NewPermissionInfo(android.Manifest.permission.WRITE_SDCARD,

            new PackageParser.NewPermissionInfo(android.Manifest.permission.WRITE_EXTERNAL_STORAGE,

                    android.os.Build.VERSION_CODES.DONUT, 0),

                    android.os.Build.VERSION_CODES.DONUT, 0),

            new PackageParser.NewPermissionInfo(android.Manifest.permission.READ_PHONE_STATE,

            new PackageParser.NewPermissionInfo(android.Manifest.permission.READ_PHONE_STATE,

                    android.os.Build.VERSION_CODES.DONUT, 0)

                    android.os.Build.VERSION_CODES.DONUT, 0)

core/java/android/os/Build.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -117,7 +117,7 @@ public class Build { 
         * new changes in behavior:</p>

         * new changes in behavior:</p>

         * <ul>

         * <ul>

         * <li> They must explicitly request the

         * <li> They must explicitly request the

         * {@link android.Manifest.permission#WRITE_SDCARD} permission to be

         * {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} permission to be

         * able to modify the contents of the SD card.  (Apps targeting

         * able to modify the contents of the SD card.  (Apps targeting

         * earlier versions will always request the permission.)

         * earlier versions will always request the permission.)

         * </ul>

         * </ul>

core/res/AndroidManifest.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -382,8 +382,8 @@ 
        android:label="@string/permgrouplab_storage"

        android:label="@string/permgrouplab_storage"

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

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





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

    <!-- Allows an application to write to external storage -->

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

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

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

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

        android:label="@string/permlab_sdcardWrite"

        android:label="@string/permlab_sdcardWrite"

        android:description="@string/permdesc_sdcardWrite"

        android:description="@string/permdesc_sdcardWrite"

data/etc/platform.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ 
        <group gid="log" />

        <group gid="log" />

    </permission>

    </permission>





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

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

        <group gid="sdcard_rw" />

        <group gid="sdcard_rw" />

    </permission>

    </permission>
@@ -85,7 +85,7 @@ 
         interact with the system. -->

         interact with the system. -->





    <!-- Standard permissions granted to the shell. -->

    <!-- Standard permissions granted to the shell. -->

    <assign-permission name="android.permission.WRITE_SDCARD" uid="shell" />

    <assign-permission name="android.permission.WRITE_EXTERNAL_STORAGE" uid="shell" />

    <assign-permission name="android.permission.SEND_SMS" uid="shell" />

    <assign-permission name="android.permission.SEND_SMS" uid="shell" />

    <assign-permission name="android.permission.CALL_PHONE" uid="shell" />

    <assign-permission name="android.permission.CALL_PHONE" uid="shell" />

    <assign-permission name="android.permission.READ_CONTACTS" uid="shell" />

    <assign-permission name="android.permission.READ_CONTACTS" uid="shell" />