From 77b11fa4707dffe94d253e951e5409d3c3f5a130 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Fri, 16 Oct 2015 10:13:53 -0400 Subject: 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 --- .../android/settings/inputmethod/UserDictionaryAddWordActivity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/com/android') diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java index 2901673..587f41c 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java +++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java @@ -56,7 +56,10 @@ public class UserDictionaryAddWordActivity extends Activity { // The following will get the EXTRA_WORD and EXTRA_LOCALE fields that are in the intent. // We do need to add the action by hand, because UserDictionaryAddWordContents expects // it to be in the bundle, in the EXTRA_MODE key. - final Bundle args = intent.getExtras(); + Bundle args = intent.getExtras(); + if (args == null) { + args = new Bundle(); + } args.putInt(UserDictionaryAddWordContents.EXTRA_MODE, mode); if (null != savedInstanceState) { @@ -74,6 +77,7 @@ public class UserDictionaryAddWordActivity extends Activity { private void reportBackToCaller(final int resultCode, final Bundle result) { final Intent senderIntent = getIntent(); + if (senderIntent.getExtras() == null) return; final Object listener = senderIntent.getExtras().get("listener"); if (!(listener instanceof Messenger)) return; // This will work if listener is null too. final Messenger messenger = (Messenger)listener; -- cgit v1.1