am 3a6b35fe: Merge "Fix crash when number is null" into klp-dev (9108e3d0) · Commits · e / os / android_packages_apps_Dialer

src/com/android/dialer/calllog/PhoneNumberUtilsWrapper.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,7 @@ public class PhoneNumberUtilsWrapper {
	* mock-out this, it is not a static method.		* mock-out this, it is not a static method.
	*/		*/
	public boolean isVoicemailNumber(CharSequence number) {		public boolean isVoicemailNumber(CharSequence number) {
	return PhoneNumberUtils.isVoiceMailNumber(number.toString());		return number!= null && PhoneNumberUtils.isVoiceMailNumber(number.toString());
	}		}

	/**		/**
	@@ -58,7 +58,7 @@ public class PhoneNumberUtilsWrapper {
	* static method.		* static method.
	*/		*/
	public boolean isSipNumber(CharSequence number) {		public boolean isSipNumber(CharSequence number) {
	return PhoneNumberUtils.isUriNumber(number.toString());		return number != null && PhoneNumberUtils.isUriNumber(number.toString());
	}		}

	public static boolean isUnknownNumberThatCanBeLookedUp(CharSequence number, int presentation) {		public static boolean isUnknownNumberThatCanBeLookedUp(CharSequence number, int presentation) {
	@@ -77,13 +77,13 @@ public class PhoneNumberUtilsWrapper {
	if (new PhoneNumberUtilsWrapper().isVoicemailNumber(number)) {		if (new PhoneNumberUtilsWrapper().isVoicemailNumber(number)) {
	return false;		return false;
	}		}
	if (isLegacyUnknownNumbers(number.toString())) {		if (isLegacyUnknownNumbers(number)) {
	return false;		return false;
	}		}
	return true;		return true;
	}		}

	public static boolean isLegacyUnknownNumbers(CharSequence number) {		public static boolean isLegacyUnknownNumbers(CharSequence number) {
	return LEGACY_UNKNOWN_NUMBERS.contains(number.toString());		return number != null && LEGACY_UNKNOWN_NUMBERS.contains(number.toString());
	}		}
	}		}