Merge "Add a hidden API for EXTRA_LAST_KNOWN_NETWORK_COUNTRY" into rvc-dev am: 00813b7648 am: 57fa34bd18

Change-Id: Ibc9a05f73c85b6ea4ef9d851962fe103bc84cb08
This commit is contained in:
Shuo Qian
2020-03-27 20:18:45 +00:00
committed by Automerger Merge Worker

View File

@@ -12267,6 +12267,17 @@ public class TelephonyManager {
public static final String EXTRA_NETWORK_COUNTRY = public static final String EXTRA_NETWORK_COUNTRY =
"android.telephony.extra.NETWORK_COUNTRY"; "android.telephony.extra.NETWORK_COUNTRY";
/**
* 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.
* <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";
/** /**
* Indicate if the user is allowed to use multiple SIM cards at the same time to register * Indicate if the user is allowed to use multiple SIM cards at the same time to register
* on the network (e.g. Dual Standby or Dual Active) when the device supports it, or if the * on the network (e.g. Dual Standby or Dual Active) when the device supports it, or if the