commit c1f2724b1ac3120f160e2513ef07e31eec0e6ae8
author Jay Shrauner <shrauner@google.com> Wed Sep 30 18:27:29 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 30 18:27:29 2015 +0000
tree 1ed94cba2e0d9c23ea1642dcdab653e821b8ac02
parent ab73969721f71228506802117eca0a6b7729f6d7
parent 26d51ed480c6cf7b0399f5841548da39ca5ee644

Merge "Fix NPE in getPhoneType/getEmailType" into ub-contactsdialer-a-dev

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