Merge change 2805 into donut
* changes:
base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
diff --git a/api/current.xml b/api/current.xml
index 3e22a13..d1d57ad 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -1167,11 +1167,11 @@
visibility="public"
>
</field>
-<field name="WRITE_SDCARD"
+<field name="WRITE_EXTERNAL_STORAGE"
type="java.lang.String"
transient="false"
volatile="false"
- value=""android.permission.WRITE_SDCARD""
+ value=""android.permission.WRITE_EXTERNAL_STORAGE""
static="true"
final="true"
deprecated="not deprecated"
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 36d154e..212b590 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -76,7 +76,7 @@
*/
public static final PackageParser.NewPermissionInfo NEW_PERMISSIONS[] =
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),
new PackageParser.NewPermissionInfo(android.Manifest.permission.READ_PHONE_STATE,
android.os.Build.VERSION_CODES.DONUT, 0)
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 963875d..830b0bd 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -117,7 +117,7 @@
* new changes in behavior:</p>
* <ul>
* <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
* earlier versions will always request the permission.)
* </ul>
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index b105aaa..20cb34a 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -382,8 +382,8 @@
android:label="@string/permgrouplab_storage"
android:description="@string/permgroupdesc_storage" />
- <!-- Allows an application to write to the SD card -->
- <permission android:name="android.permission.WRITE_SDCARD"
+ <!-- Allows an application to write to external storage -->
+ <permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:permissionGroup="android.permission-group.STORAGE"
android:label="@string/permlab_sdcardWrite"
android:description="@string/permdesc_sdcardWrite"
diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index 33d6b3b..0bd3276 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -54,7 +54,7 @@
<group gid="log" />
</permission>
- <permission name="android.permission.WRITE_SDCARD" >
+ <permission name="android.permission.WRITE_EXTERNAL_STORAGE" >
<group gid="sdcard_rw" />
</permission>
@@ -85,7 +85,7 @@
interact with the system. -->
<!-- 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.CALL_PHONE" uid="shell" />
<assign-permission name="android.permission.READ_CONTACTS" uid="shell" />
diff --git a/media/tests/MediaFrameworkTest/AndroidManifest.xml b/media/tests/MediaFrameworkTest/AndroidManifest.xml
index ac59799..6908220 100644
--- a/media/tests/MediaFrameworkTest/AndroidManifest.xml
+++ b/media/tests/MediaFrameworkTest/AndroidManifest.xml
@@ -19,7 +19,7 @@
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.WRITE_SDCARD" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application>
<uses-library android:name="android.test.runner" />
<activity android:label="@string/app_name"
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 04e0253..c9bdd3c 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -2843,7 +2843,7 @@
if (npi.name.equals(perm)
&& pkg.applicationInfo.targetSdkVersion < npi.sdkVersion) {
allowed = true;
- Log.i(TAG, "Auto-granting WRITE_SDCARD to old pkg "
+ Log.i(TAG, "Auto-granting WRITE_EXTERNAL_STORAGE to old pkg "
+ pkg.packageName);
break;
}
diff --git a/tests/DumpRenderTree/AndroidManifest.xml b/tests/DumpRenderTree/AndroidManifest.xml
index 5442ec9..24d1687 100644
--- a/tests/DumpRenderTree/AndroidManifest.xml
+++ b/tests/DumpRenderTree/AndroidManifest.xml
@@ -32,5 +32,5 @@
android:label="Layout test automation runner"
/>
<uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.WRITE_SDCARD" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
</manifest>
diff --git a/tests/sketch/AndroidManifest.xml b/tests/sketch/AndroidManifest.xml
index fbf3a09b..b8a13f6 100755
--- a/tests/sketch/AndroidManifest.xml
+++ b/tests/sketch/AndroidManifest.xml
@@ -17,7 +17,7 @@
package="com.android.gesture.example">
<uses-permission android:name="android.permission.READ_CONTACTS" />
- <uses-permission android:name="android.permission.WRITE_SDCARD" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application android:icon="@drawable/icon" android:label="@string/app_name">