commit b6e3ecb718dc1d849849c16f5abf1bff303419a8
author Wenyi Wang <wenyiw@google.com> Wed Dec 16 18:03:33 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 16 18:03:33 2015 +0000
tree 67d9795eff12e6c62a2e645261d6362d91020bae
parent 1f4a623084219ae9f8d7c012c0d25c63c7aae7ca
parent ab36017cd9385e3180aff694939cc4280fd008eb

Merge "Fix NPE in getPhotos()" into ub-contactsdialer-b-dev

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

diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
index 6fb07a6..7be748e 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -458,7 +458,7 @@
                 final String customText = editText.getText().toString().trim();
                 if (ContactsUtils.isGraphic(customText)) {
                     final List<EditType> allTypes =
-                            RawContactModifier.getValidTypes(mState, mKind, null);
+                            RawContactModifier.getValidTypes(mState, mKind, null, true, null, true);
                     mType = null;
                     for (EditType editType : allTypes) {
                         if (editType.customColumn != null) {
@@ -598,7 +598,7 @@
                 }
             }
 
-            addAll(RawContactModifier.getValidTypes(mState, mKind, mType));
+            addAll(RawContactModifier.getValidTypes(mState, mKind, mType, true, null, false));
         }
 
         public boolean hasCustomSelection() {