diff options
| author | Kenny Root <kroot@google.com> | 2010-10-18 13:03:35 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-10-18 13:03:35 -0700 |
| commit | 027610a76e67f39e3a435d68ec785a1cf09dcf9c (patch) | |
| tree | 3de83809df6336bef734be54274bda7eefb3f3d2 /core/res/AndroidManifest.xml | |
| parent | afb05db237c2d614ddde77f033e0ac1856f17170 (diff) | |
| parent | 964eb4389bb62e4e9e7f65ef7b9307e052053679 (diff) | |
| download | frameworks_base-027610a76e67f39e3a435d68ec785a1cf09dcf9c.zip frameworks_base-027610a76e67f39e3a435d68ec785a1cf09dcf9c.tar.gz frameworks_base-027610a76e67f39e3a435d68ec785a1cf09dcf9c.tar.bz2 | |
resolved conflicts for merge of 964eb438 to master
Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e
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 1514b37..3e99541 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1389,7 +1389,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" /> @@ -1399,8 +1400,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> |