commit b8c5c40ca215f874b72302d3d607f338517b05a1
author Maurice Chu <mochu@google.com> Thu Aug 16 09:19:55 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 16 09:19:55 2012 -0700
tree e970f2f98e2a2e18f6c409ce1092e635cf0ea34f
parent 18f2bf697651d1de34f9ec12b39a78992e4d2136
parent d09b9a40fc57d76b32b8e7f522b9ed2b192dec96

am d09b9a40: am f4bb763f: Merge "Fix binding editors when state is null" into jb-mr1-dev

* commit 'd09b9a40fc57d76b32b8e7f522b9ed2b192dec96':
  Fix binding editors when state is null

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);