diff options
| author | Jason Monk <jmonk@google.com> | 2015-10-16 10:13:53 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2015-10-16 10:13:53 -0400 |
| commit | 77b11fa4707dffe94d253e951e5409d3c3f5a130 (patch) | |
| tree | b7d45f8fbeabb9daaf915efd68fa8f0058fd6967 /AndroidManifest.xml | |
| parent | 1704ca968d4566218f159817625f849c1dc34d96 (diff) | |
| download | packages_apps_Settings-77b11fa4707dffe94d253e951e5409d3c3f5a130.zip packages_apps_Settings-77b11fa4707dffe94d253e951e5409d3c3f5a130.tar.gz packages_apps_Settings-77b11fa4707dffe94d253e951e5409d3c3f5a130.tar.bz2 | |
Fix crashes in Settings
Fix problems from unsupported intents being launched through adb.
Remove the ones we can, fix the other.
Bug: 19634064
Change-Id: Iba0adeb135e76ee70365e5891380ba8b55110c26
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b003e39..3d538a1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -671,7 +671,6 @@ android:excludeFromRecents="true"> <intent-filter android:priority="1"> <action android:name="com.android.settings.USER_DICTIONARY_INSERT" /> - <action android:name="com.android.settings.USER_DICTIONARY_EDIT" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" @@ -1736,27 +1735,6 @@ <activity android:name=".AppPicker" android:label="@string/select_application" android:theme="@android:style/Theme.Material.Light.Dialog" /> - <activity android:name="Settings$UsbSettingsActivity" - android:label="@string/storage_title_usb" - android:taskAffinity="com.android.settings" - android:parentActivityName="Settings$StorageSettingsActivity"> - <intent-filter android:priority="1"> - <action android:name="android.settings.STORAGE_USB_SETTINGS" /> - <action android:name="com.android.settings.STORAGE_USB_SETTINGS" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - <meta-data android:name="com.android.settings.FRAGMENT_CLASS" - android:value="com.android.settings.deviceinfo.UsbSettings" /> - <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" - android:resource="@id/storage_settings" /> - <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" - android:value="true" /> - </activity> - <!-- Keep compatibility with old shortcuts. --> <activity-alias android:name="UsbSettings" android:exported="true" |