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

Commit e4ba0c55 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Fixed the document of getNetworkCountryIso" am: 8252157a am: 7f97be01 

am: 630be57f

Change-Id: I5060c3bac5e28e02d08e7abce6e0552ee4a02b2e
parents 97667705 630be57f

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1877,7 +1877,7 @@ public class TelephonyManager { 




    /**

    /**

     * Returns the ISO country code equivalent of the MCC (Mobile Country Code) of the current

     * Returns the ISO country code equivalent of the MCC (Mobile Country Code) of the current

     * registered operator, or nearby cell information if not registered.

     * registered operator or the cell nearby, if available.

     * .

     * .

     * <p>

     * <p>

     * Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine

     * Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine
@@ -1889,7 +1889,7 @@ public class TelephonyManager { 




    /**

    /**

     * Returns the ISO country code equivalent of the MCC (Mobile Country Code) of the current

     * Returns the ISO country code equivalent of the MCC (Mobile Country Code) of the current

     * registered operator, or nearby cell information if not registered.

     * registered operator or the cell nearby, if available.

     * <p>

     * <p>

     * Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine

     * Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine

     * if on a CDMA network).

     * if on a CDMA network).