diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2015-04-05 19:30:08 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2015-04-05 19:30:35 +0700 |
| commit | 38c39f987b7bdcdb47277903dd20b350bdeba21f (patch) | |
| tree | 3f69e73983f1ae6ab7dac7274482e0bbc4250b89 | |
| parent | 579a7f03a3d44151aa8d4f1c1189d3df329f007d (diff) | |
| download | android_packages_apps_ContactsCommon-38c39f987b7bdcdb47277903dd20b350bdeba21f.tar.gz android_packages_apps_ContactsCommon-38c39f987b7bdcdb47277903dd20b350bdeba21f.tar.bz2 android_packages_apps_ContactsCommon-38c39f987b7bdcdb47277903dd20b350bdeba21f.zip | |
ContactsCommon: fix NPE on importing contact with multiple accounts
java.lang.NullPointerException: Attempt to invoke virtual method 'void android.content.Context.startActivity(android.content.Intent)' on a null object reference
at com.android.contacts.common.util.AccountSelectionUtil.doImportFromSim(AccountSelectionUtil.java:232)
at com.android.contacts.common.util.AccountSelectionUtil.doImport(AccountSelectionUtil.java:211)
at com.android.contacts.common.interactions.ImportExportDialogFragment.onAccountChosen(ImportExportDialogFragment.java:333)
at com.android.contacts.common.editor.SelectAccountDialogFragment.onAccountSelected(SelectAccountDialogFragment.java:113)
at com.android.contacts.common.editor.SelectAccountDialogFragment.access$000(SelectAccountDialogFragment.java:36)
at com.android.contacts.common.editor.SelectAccountDialogFragment$1.onClick(SelectAccountDialogFragment.java:86)
at com.android.internal.app.AlertController$AlertParams$3.onItemClick(AlertController.java:1082)
[snip]
Change-Id: Id07857200cb341ce916da46c5be852c0573f65f2
| -rw-r--r-- | src/com/android/contacts/common/interactions/ImportExportDialogFragment.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java index f9004d96..9c1224c6 100644 --- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java +++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java @@ -243,7 +243,7 @@ public class ImportExportDialogFragment extends DialogFragment new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - boolean dismissDialog; + boolean dismissDialog = true; final int resId = adapter.getItem(which).mChoiceResourceId; switch (resId) { case R.string.import_from_sim: @@ -273,7 +273,9 @@ public class ImportExportDialogFragment extends DialogFragment + getActivity().getResources().getResourceEntryName(resId)); } } + if (dismissDialog) { dialog.dismiss(); + } } }; return new AlertDialog.Builder(getActivity()) |