commit 99b3c236f4b3ed6df58684b0ec5ce27be2165e6e
author Jay Shrauner <shrauner@google.com> Fri Jan 10 11:51:45 2014 -0800
committer Jay Shrauner <shrauner@google.com> Sat Mar 01 18:55:17 2014 +0000
tree b36d10e4ee79a38563d19ee9e4f7fd3bc8223779
parent 2ebea8a04142a9ed338fbb8e98eb27a869c0f223

Fix NPE when kind is null in getBestType

Fix alternate insertChild() method to detect and bail on null kind just
like primary insertChild() method does. Also change getBestValidType()
not to crash on null kind.

Bug:12490438
Change-Id: I82c351ccd5a880fb8bc71b5b27ffb2662c071be3
(cherry picked from commit 29a094106357ea806dc029437af77ec91b94cafb)

src/com/android/contacts/common/model/RawContactModifier.java

diff --git a/src/com/android/contacts/common/model/RawContactModifier.java b/src/com/android/contacts/common/model/RawContactModifier.java
index 0cd243c..ac586a2 100644
--- a/src/com/android/contacts/common/model/RawContactModifier.java
+++ b/src/com/android/contacts/common/model/RawContactModifier.java
@@ -305,7 +305,7 @@
     public static EditType getBestValidType(RawContactDelta state, DataKind kind,
             boolean includeSecondary, int exactValue) {
         // Shortcut when no types
-        if (kind.typeColumn == null) return null;
+        if (kind == null || kind.typeColumn == null) return null;
 
         // Find type counts and valid primary types, bail if none
         final SparseIntArray typeCount = getTypeFrequencies(state, kind);
@@ -347,6 +347,8 @@
      * {@link #getBestValidType(RawContactDelta, DataKind, boolean, int)}.
      */
     public static ValuesDelta insertChild(RawContactDelta state, DataKind kind) {
+        // Bail early if invalid kind
+        if (kind == null) return null;
         // First try finding a valid primary
         EditType bestType = getBestValidType(state, kind, false, Integer.MIN_VALUE);
         if (bestType == null) {