diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-16 16:51:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-16 16:51:13 -0700 |
| commit | 964eb4389bb62e4e9e7f65ef7b9307e052053679 (patch) | |
| tree | c1d32d034b1f976d06d61d3adf9c167964367e7e /core/res/AndroidManifest.xml | |
| parent | 157fa0aca55b8e4747f00d2b729e5e361dea7ddb (diff) | |
| parent | 424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0 (diff) | |
| download | frameworks_base-964eb4389bb62e4e9e7f65ef7b9307e052053679.zip frameworks_base-964eb4389bb62e4e9e7f65ef7b9307e052053679.tar.gz frameworks_base-964eb4389bb62e4e9e7f65ef7b9307e052053679.tar.bz2 | |
am 42499170: Implement issue #3094621 and #3094609 - wipe sd card
Merge commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0' into gingerbread-plus-aosp
* commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0':
Implement issue #3094621 and #3094609 - wipe sd card
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ff079e4..ef4ee11 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1371,7 +1371,8 @@ </receiver> <receiver android:name="com.android.server.MasterClearReceiver" - android:permission="android.permission.MASTER_CLEAR" > + android:permission="android.permission.MASTER_CLEAR" + android:priority="100" > <intent-filter> <!-- For Checkin, Settings, etc.: action=MASTER_CLEAR --> <action android:name="android.intent.action.MASTER_CLEAR" /> @@ -1381,8 +1382,11 @@ <category android:name="android.intent.category.MASTER_CLEAR" /> </intent-filter> </receiver> - </application> -</manifest> + <service android:name="com.android.internal.os.storage.ExternalStorageFormatter" + android:permission="android.permission.MASTER_CLEAR" + android:exported="true" /> + </application> +</manifest> |