Merge "Fix NPE in getPhoneType/getEmailType" into ub-contactsdialer-a-dev (c1f2724b) · Commits · e / os / android_packages_apps_Contacts

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -545,11 +545,11 @@ public class ValuesDelta implements Parcelable {
		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 @@ public class ValuesDelta implements Parcelable {
		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);
		}