commit 26d51ed480c6cf7b0399f5841548da39ca5ee644
author Jay Shrauner <shrauner@google.com> Tue Sep 29 14:52:55 2015 -0700
committer Jay Shrauner <shrauner@google.com> Tue Sep 29 14:52:55 2015 -0700
tree eca7d65f08729c146299307ca0fe741abd28db8b
parent e4392ea8daab5b7255900f35a979f2cada748645

Fix NPE in getPhoneType/getEmailType

Change getPhoneType/getEmailType to return Integer instead of int. Rename
phoneHasType/emailHasType to hasPhoneType/hasEmailType and change to null
check return value of get methods.

Bug:24506801
Change-Id: If63ae76a93abcad646fc05b679d975c0d77b3f38

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

diff --git a/src/com/android/contacts/common/model/ValuesDelta.java b/src/com/android/contacts/common/model/ValuesDelta.java
index 36321d2..77259f6 100644
--- a/src/com/android/contacts/common/model/ValuesDelta.java
+++ b/src/com/android/contacts/common/model/ValuesDelta.java
@@ -545,11 +545,11 @@
         return getAsString(ContactsContract.CommonDataKinds.Phone.NORMALIZED_NUMBER);
     }
 
-    public boolean phoneHasType() {
-        return containsKey(ContactsContract.CommonDataKinds.Phone.TYPE);
+    public boolean hasPhoneType() {
+        return getPhoneType() != null;
     }
 
-    public int getPhoneType() {
+    public Integer getPhoneType() {
         return getAsInteger(ContactsContract.CommonDataKinds.Phone.TYPE);
     }
 
@@ -561,11 +561,11 @@
         return getAsString(ContactsContract.CommonDataKinds.Email.DATA);
     }
 
-    public boolean emailHasType() {
-        return containsKey(ContactsContract.CommonDataKinds.Email.TYPE);
+    public boolean hasEmailType() {
+        return getEmailType() != null;
     }
 
-    public int getEmailType() {
+    public Integer getEmailType() {
         return getAsInteger(ContactsContract.CommonDataKinds.Email.TYPE);
     }