commit 3f5977b5f478b1fc1af46984714cfd1e5f2f39e4
author Jay Shrauner <shrauner@google.com> Wed May 13 20:15:55 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 13 20:15:55 2015 +0000
tree de84ff18d9967c9db2d5252968d86a9ba7857b5e
parent 95df16513eac2942fef50caaea5c2b488b7c3cae
parent 882128af0b342f13b03f78491225a89c45822699

am 882128af: Fix NPE in onRestoreInstanceState

* commit '882128af0b342f13b03f78491225a89c45822699':
  Fix NPE in onRestoreInstanceState

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

diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index 4c7a322..6f24bb9 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -392,7 +392,8 @@
 
         mHideOptional = ss.mHideOptional;
 
-        int numChildren = Math.min(mFieldEditTexts.length, ss.mVisibilities.length);
+        int numChildren = Math.min(mFieldEditTexts == null ? 0 : mFieldEditTexts.length,
+                ss.mVisibilities == null ? 0 : ss.mVisibilities.length);
         for (int i = 0; i < numChildren; i++) {
             mFieldEditTexts[i].setVisibility(ss.mVisibilities[i]);
         }