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

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

Merge "Added a broadcast intent for clients to listen for country changes" am: 090b59fa 

am: 16dd167d

Change-Id: I071e3246b31fe1d768df95908f2484565375cd29
parents 9007b5e9 16dd167d

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -43092,6 +43092,7 @@ package android.telephony { 
    method @Deprecated public void setVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle, boolean);

    method public boolean updateAvailableNetworks(java.util.List<android.telephony.AvailableNetworkInfo>);

    field public static final String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL";

    field public static final String ACTION_NETWORK_COUNTRY_CHANGED = "android.telephony.action.NETWORK_COUNTRY_CHANGED";

    field @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";

    field public static final String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";

    field public static final String ACTION_SECRET_CODE = "android.telephony.action.SECRET_CODE";
@@ -43129,6 +43130,7 @@ package android.telephony { 
    field 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_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";

    field public static final String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telephony.extra.PHONE_ACCOUNT_HANDLE";

    field public static final String EXTRA_PRECISE_CARRIER_ID = "android.telephony.extra.PRECISE_CARRIER_ID";

telephony/java/android/telephony/TelephonyManager.java

+22 −0
Original line number Diff line number Diff line
@@ -9848,4 +9848,26 @@ public class TelephonyManager { 
        }

        return true;

    }



    /**

     * Broadcast intent action for network country code changes.

     *

     * <p>

     * The {@link #EXTRA_NETWORK_COUNTRY} extra indicates the country code of the current

     * network returned by {@link #getNetworkCountryIso()}.

     *

     * @see #EXTRA_NETWORK_COUNTRY

     * @see #getNetworkCountryIso()

     */

    public static final String ACTION_NETWORK_COUNTRY_CHANGED =

            "android.telephony.action.NETWORK_COUNTRY_CHANGED";



    /**

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

     * the country code in ISO 3166 format.

     * <p class="note">

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

     */

    public static final String EXTRA_NETWORK_COUNTRY =

            "android.telephony.extra.NETWORK_COUNTRY";

}