commit 4acc29e8f65e5939f72347af1b0ec3087f8bb6ec
author Katherine Kuan <katherinekuan@google.com> Thu Jul 28 13:59:08 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 28 13:59:08 2011 -0700
tree c5065255ab28f065d73c85c3bccea2b489ad4d97
parent 8b1fe76ff6d68b79427acfb4498bed0986a6518c
parent 1c07d4bf219bcdcc433b69a40ed3398ba7b3389f

Merge "Fix NPE in GroupEditorFragment name checks"

src/com/android/contacts/group/GroupEditorFragment.java

diff --git a/src/com/android/contacts/group/GroupEditorFragment.java b/src/com/android/contacts/group/GroupEditorFragment.java
index 96fb4b8..ccc84a2 100644
--- a/src/com/android/contacts/group/GroupEditorFragment.java
+++ b/src/com/android/contacts/group/GroupEditorFragment.java
@@ -562,11 +562,12 @@
     }
 
     private boolean hasValidGroupName() {
-        return !TextUtils.isEmpty(mGroupNameView.getText());
+        return mGroupNameView != null && !TextUtils.isEmpty(mGroupNameView.getText());
     }
 
     private boolean hasNameChange() {
-        return !mGroupNameView.getText().toString().equals(mOriginalGroupName);
+        return mGroupNameView != null &&
+                !mGroupNameView.getText().toString().equals(mOriginalGroupName);
     }
 
     private boolean hasMembershipChange() {