Skip to content

Commit e69ec22

Browse files
author
Daisuke Miyakawa
committed
Remove STOPSHIP part of the logging in telephony
We still need the log itself to trap the exceptional case. Bug: 6201805 Change-Id: I62d12f6a1ed41817ee12c0f5c7fc4aa0a967a60f
1 parent 794db6c commit e69ec22

File tree

1 file changed

+1
-20
lines changed

1 file changed

+1
-20
lines changed

telephony/java/android/telephony/PhoneNumberUtils.java

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1711,12 +1711,8 @@ private static boolean isEmergencyNumberInternal(String number,
17111711
return false;
17121712
}
17131713

1714-
// STOPSHIP: remove this after figuring out issue 5914560, 6383850.
17151714
Log.d(LOG_TAG, "System property doesn't provide any emergency numbers."
1716-
+ " Use embedded logic for determining emergency numbers."
1717-
+ " number: " + toLogSafePhoneNumber(number)
1718-
+ ", Iso: " + defaultCountryIso
1719-
+ ", useExactMatch: " + useExactMatch);
1715+
+ " Use embedded logic for determining ones.");
17201716

17211717
// No ecclist system property, so use our own list.
17221718
if (defaultCountryIso != null) {
@@ -1735,21 +1731,6 @@ private static boolean isEmergencyNumberInternal(String number,
17351731
}
17361732
}
17371733

1738-
private static String toLogSafePhoneNumber(String number) {
1739-
// Do exactly same thing as Uri#toSafeString() does, which will enable us to compare
1740-
// sanitized phone numbers.
1741-
StringBuilder builder = new StringBuilder();
1742-
for (int i = 0; i < number.length(); i++) {
1743-
char c = number.charAt(i);
1744-
if (c == '-' || c == '@' || c == '.') {
1745-
builder.append(c);
1746-
} else {
1747-
builder.append('x');
1748-
}
1749-
}
1750-
return builder.toString();
1751-
}
1752-
17531734
/**
17541735
* Checks if a given number is an emergency number for the country that the user is in. The
17551736
* current country is determined using the CountryDetector.

0 commit comments

Comments
 (0)