commit 882128af0b342f13b03f78491225a89c45822699
author Jay Shrauner <shrauner@google.com> Wed May 13 12:21:48 2015 -0700
committer Jay Shrauner <shrauner@google.com> Wed May 13 12:23:32 2015 -0700
tree 277dd6be10cb5496988cfd5a04fd1393db12f443
parent 0f4582f32acde906aed83d4abaa9bca96c881fd2

Fix NPE in onRestoreInstanceState

Bug:21117470
Change-Id: Id14fe8382bd29b4843d8dfb75edac2c2d754151c

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