commit f4bb763f02da417044882a4121b5188a426f3700
author Maurice Chu <mochu@google.com> Thu Aug 16 09:17:36 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 16 09:17:37 2012 -0700
tree e970f2f98e2a2e18f6c409ce1092e635cf0ea34f
parent 20578b8f7595cc3fbf8a0c9bd5b62fca5f4b4556
parent 5671c7e7718c3285dc0391807401083986fcfd51

Merge "Fix binding editors when state is null" into jb-mr1-dev

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

diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 780279e..5ee6ff9 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -675,6 +675,12 @@
     }
 
     private void bindEditors() {
+        // bindEditors() can only bind views if there is data in mState, so immediately return
+        // if mState is null
+        if (mState == null) {
+            return;
+        }
+
         // Sort the editors
         Collections.sort(mState, mComparator);