Merge "Add debug log for 5914560 and 6383850" into jb-dev
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index 183beb1..5afe56c 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -1711,6 +1711,13 @@
return false;
}
+ // STOPSHIP: remove this after figuring out issue 5914560, 6383850.
+ Log.d(LOG_TAG, "System property doesn't provide any emergency numbers."
+ + " Use embedded logic for determining emergency numbers."
+ + " number: " + toLogSafePhoneNumber(number)
+ + ", Iso: " + defaultCountryIso
+ + ", useExactMatch: " + useExactMatch);
+
// No ecclist system property, so use our own list.
if (defaultCountryIso != null) {
ShortNumberUtil util = new ShortNumberUtil();
@@ -1728,6 +1735,21 @@
}
}
+ private static String toLogSafePhoneNumber(String number) {
+ // Do exactly same thing as Uri#toSafeString() does, which will enable us to compare
+ // sanitized phone numbers.
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < number.length(); i++) {
+ char c = number.charAt(i);
+ if (c == '-' || c == '@' || c == '.') {
+ builder.append(c);
+ } else {
+ builder.append('x');
+ }
+ }
+ return builder.toString();
+ }
+
/**
* Checks if a given number is an emergency number for the country that the user is in. The
* current country is determined using the CountryDetector.