summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-04-17 16:03:22 -0700
committerJeff Sharkey <jsharkey@android.com>2012-04-25 14:56:13 -0700
commit6dcf382b1b1dde5e6303a51a27f8d3b928072415 (patch)
treebb3118d20a9e0a3e98d776afa8ff054aa9817306 /core/res
parent7725180c646d1976a2a2097735862a75ec47c544 (diff)
downloadframeworks_base-6dcf382b1b1dde5e6303a51a27f8d3b928072415.zip
frameworks_base-6dcf382b1b1dde5e6303a51a27f8d3b928072415.tar.gz
frameworks_base-6dcf382b1b1dde5e6303a51a27f8d3b928072415.tar.bz2
Move RINGTONE_PICKER to handle external storage.
To give RINGTONE_PICKER external storage access, move it from system to MediaProvider. Fix OOBE when getRingtoneUri() kicked requery(). Bug: 6346701 Change-Id: I837002eef0580b8cdd8920a27b068c745995a8a3
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml10
1 files changed, 0 insertions, 10 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index e1b9d55..60d2159 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1658,16 +1658,6 @@
android:excludeFromRecents="true"
android:process=":ui">
</activity>
- <activity android:name="com.android.internal.app.RingtonePickerActivity"
- android:theme="@style/Theme.Holo.Dialog.Alert"
- android:excludeFromRecents="true"
- android:multiprocess="true"
- android:process=":ui">
- <intent-filter>
- <action android:name="android.intent.action.RINGTONE_PICKER" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
<activity android:name="android.accounts.ChooseAccountActivity"
android:excludeFromRecents="true"