commit af7b79978693a0921437bb2c6ceec985003a2c67
author Jay Shrauner <shrauner@google.com> Fri Feb 21 13:09:09 2014 -0800
committer Jay Shrauner <shrauner@google.com> Sat Mar 01 20:37:17 2014 +0000
tree d784c4187ceab8767d50e87c80f01998ed4f738a
parent 49a9c120b0b6e3942bc950143f1e2970c8ff374a

Fix NPE in setGroupMetaData

Check that listView is non-null before dereferencing it. Catch case
in onClick() where popup was dismissed but mPopup wasn't cleared.

Bug:13136064
Change-Id: I8f826ae969434c4dce88c5fb506b5ed2cc9ea04b
(cherry picked from commit 9813b71d3a6a2e0baba96cda72ee55415e523166)

src/com/android/contacts/editor/GroupMembershipView.java

diff --git a/src/com/android/contacts/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java
index db389fb..fec0aba 100644
--- a/src/com/android/contacts/editor/GroupMembershipView.java
+++ b/src/com/android/contacts/editor/GroupMembershipView.java
@@ -188,7 +188,7 @@
                 // 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 @@
     @Override
     public void onClick(View v) {
         if (UiClosables.closeQuietly(mPopup)) {
+            mPopup = null;
             return;
         }