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

Commit b0f2f44f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update Javadoc to clarify format for country ISO." into udc-dev am: f9a43c05 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21644763



Change-Id: Ibf4940097f6d4dca963e396b181df8418ae69ade
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f59656bb f9a43c05

telephony/java/android/telephony/PhoneNumberUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -1526,7 +1526,7 @@ public class PhoneNumberUtils { 
     * Formats the specified {@code phoneNumber} to the E.164 representation.

     *

     * @param phoneNumber the phone number to format.

     * @param defaultCountryIso the ISO 3166-1 two letters country code.

     * @param defaultCountryIso the ISO 3166-1 two letters country code in UPPER CASE.

     * @return the E.164 representation, or null if the given phone number is not valid.

     */

    public static String formatNumberToE164(String phoneNumber, String defaultCountryIso) {
@@ -1537,7 +1537,7 @@ public class PhoneNumberUtils { 
     * Formats the specified {@code phoneNumber} to the RFC3966 representation.

     *

     * @param phoneNumber the phone number to format.

     * @param defaultCountryIso the ISO 3166-1 two letters country code.

     * @param defaultCountryIso the ISO 3166-1 two letters country code in UPPER CASE.

     * @return the RFC3966 representation, or null if the given phone number is not valid.

     */

    public static String formatNumberToRFC3966(String phoneNumber, String defaultCountryIso) {