Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 2805 into donut

Browse Source 
* changes:
  base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
This commit is contained in:
Android (Google) Code Review
2009-06-01 09:58:44 -07:00
parent 450ad31b62 5a3a77dabd
commit 162c9d0e90
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.xml
View File

@@ -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="&quot;android.permission.WRITE_SDCARD&quot;"
value="&quot;android.permission.WRITE_EXTERNAL_STORAGE&quot;"
static="true"
final="true"
deprecated="not deprecated"

2
core/java/android/content/pm/PackageParser.java
View File

@@ -76,7 +76,7 @@ public class PackageParser {
*/
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)

2
core/java/android/os/Build.java
View File

@@ -117,7 +117,7 @@ public class Build {
* 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>

4
core/res/AndroidManifest.xml
View File

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

4
data/etc/platform.xml
View File

@@ -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" />

2
media/tests/MediaFrameworkTest/AndroidManifest.xml
View File

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

2
services/java/com/android/server/PackageManagerService.java
View File

@@ -2843,7 +2843,7 @@ class PackageManagerService extends IPackageManager.Stub {
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;
}

2
tests/DumpRenderTree/AndroidManifest.xml
View File

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

2
tests/sketch/AndroidManifest.xml
View File

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