Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01028b6f authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android (Google) Code Review
Browse files

Merge "Remove STOPSHIP part of the logging in telephony" into jb-dev

parents 12ff1492 e69ec225
Loading
Loading
Loading
Loading
+1 −20
Original line number Diff line number Diff line
@@ -1711,12 +1711,8 @@ public class PhoneNumberUtils
            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);
                + " Use embedded logic for determining ones.");

        // No ecclist system property, so use our own list.
        if (defaultCountryIso != null) {
@@ -1735,21 +1731,6 @@ public class PhoneNumberUtils
        }
    }

    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.