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

Commit 543deca1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Added the extra to report last known country"

parents 92e4e15b cf5c66e6

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45374,6 +45374,7 @@ package android.telephony { 
    field public static final String EXTRA_HIDE_PUBLIC_SETTINGS = "android.telephony.extra.HIDE_PUBLIC_SETTINGS";

    field @Deprecated public static final String EXTRA_INCOMING_NUMBER = "incoming_number";

    field public static final String EXTRA_IS_REFRESH = "android.telephony.extra.IS_REFRESH";

    field public static final String EXTRA_LAST_KNOWN_NETWORK_COUNTRY = "android.telephony.extra.LAST_KNOWN_NETWORK_COUNTRY";

    field public static final String EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT = "android.telephony.extra.LAUNCH_VOICEMAIL_SETTINGS_INTENT";

    field public static final String EXTRA_NETWORK_COUNTRY = "android.telephony.extra.NETWORK_COUNTRY";

    field public static final String EXTRA_NOTIFICATION_COUNT = "android.telephony.extra.NOTIFICATION_COUNT";

telephony/java/android/telephony/TelephonyManager.java

+7 −4
Original line number Diff line number Diff line
@@ -14894,7 +14894,10 @@ public class TelephonyManager { 














    /**















     * The extra used with an {@link #ACTION_NETWORK_COUNTRY_CHANGED} to specify the













     * the country code in ISO-3166-1 alpha-2 format.













     * the country code in ISO-3166-1 alpha-2 format. This is the same country code returned by













     * {@link #getNetworkCountryIso()}. This might be an empty string when the country code is not













     * available.













     *















     * <p class="note">















     * Retrieve with {@link android.content.Intent#getStringExtra(String)}.















     */









@@ -14903,11 +14906,11 @@ public class TelephonyManager {



























    /**















     * The extra used with an {@link #ACTION_NETWORK_COUNTRY_CHANGED} to specify the













     * last known the country code in ISO-3166-1 alpha-2 format.













     * last known the country code in ISO-3166-1 alpha-2 format. This might be an empty string when













     * the country code was never available. The last known country code persists across reboot.













     *















     * <p class="note">















     * Retrieve with {@link android.content.Intent#getStringExtra(String)}.













     *













     * @hide















     */















    public static final String EXTRA_LAST_KNOWN_NETWORK_COUNTRY =















            "android.telephony.extra.LAST_KNOWN_NETWORK_COUNTRY";