diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-03-04 02:21:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-04 02:21:55 +0000 |
| commit | ce29a6c702318192f696787a077159cad747b4f7 (patch) | |
| tree | 24fba844ccb738910a4be54e2f8818617e2ed9b1 | |
| parent | bb9bfba85b4b0fc359cc7e93cce30f44721c21e3 (diff) | |
| parent | af7b79978693a0921437bb2c6ceec985003a2c67 (diff) | |
| download | android_packages_apps_Contacts-ce29a6c702318192f696787a077159cad747b4f7.tar.gz android_packages_apps_Contacts-ce29a6c702318192f696787a077159cad747b4f7.tar.bz2 android_packages_apps_Contacts-ce29a6c702318192f696787a077159cad747b4f7.zip | |
Merge "Fix NPE in setGroupMetaData" into klp-dev
| -rw-r--r-- | src/com/android/contacts/editor/GroupMembershipView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/contacts/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java index 510d25726..bcea53dcf 100644 --- a/src/com/android/contacts/editor/GroupMembershipView.java +++ b/src/com/android/contacts/editor/GroupMembershipView.java @@ -188,7 +188,7 @@ public class GroupMembershipView extends LinearLayout // Ensure that the newly created group is checked. int position = mAdapter.getCount() - 2; ListView listView = mPopup.getListView(); - if (!listView.isItemChecked(position)) { + if (listView != null && !listView.isItemChecked(position)) { // Newly created group is not checked, so check it. listView.setItemChecked(position, true); onItemClick(listView, null, position, listView.getItemIdAtPosition(position)); @@ -282,6 +282,7 @@ public class GroupMembershipView extends LinearLayout @Override public void onClick(View v) { if (UiClosables.closeQuietly(mPopup)) { + mPopup = null; return; } |