Merge "API: Separates getting roaming according to overridden or non-overridden" (1f5abee8) · Commits · e / os / android_frameworks_base

core/api/current.txt

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -43608,9 +43608,12 @@ package android.telephony {
	method public int getDomain();		method public int getDomain();
	method @Nullable public String getRegisteredPlmn();		method @Nullable public String getRegisteredPlmn();
	method public int getTransportType();		method public int getTransportType();
	method public boolean isRegistered();		method public boolean isNetworkRegistered();
	method public boolean isRoaming();		method public boolean isNetworkRoaming();
	method public boolean isSearching();		method public boolean isNetworkSearching();
			method @Deprecated public boolean isRegistered();
			method @Deprecated public boolean isRoaming();
			method @Deprecated public boolean isSearching();
	method public void writeToParcel(android.os.Parcel, int);		method public void writeToParcel(android.os.Parcel, int);
	field @NonNull public static final android.os.Parcelable.Creator<android.telephony.NetworkRegistrationInfo> CREATOR;		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.NetworkRegistrationInfo> CREATOR;
	field public static final int DOMAIN_CS = 1; // 0x1		field public static final int DOMAIN_CS = 1; // 0x1
	@@ -44380,6 +44383,7 @@ package android.telephony {
	method public int describeContents();		method public int describeContents();
	method public int getNetworkType();		method public int getNetworkType();
	method public int getOverrideNetworkType();		method public int getOverrideNetworkType();
			method public boolean isRoaming();
	method public void writeToParcel(@NonNull android.os.Parcel, int);		method public void writeToParcel(@NonNull android.os.Parcel, int);
	field @NonNull public static final android.os.Parcelable.Creator<android.telephony.TelephonyDisplayInfo> CREATOR;		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.TelephonyDisplayInfo> CREATOR;
	field public static final int OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO = 2; // 0x2		field public static final int OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO = 2; // 0x2

core/api/system-current.txt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -13298,7 +13298,8 @@ package android.telephony {

	public final class NetworkRegistrationInfo implements android.os.Parcelable {		public final class NetworkRegistrationInfo implements android.os.Parcelable {
	method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo();		method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo();
	method public int getRegistrationState();		method public int getNetworkRegistrationState();
			method @Deprecated public int getRegistrationState();
	method public int getRejectCause();		method public int getRejectCause();
	method public int getRoamingType();		method public int getRoamingType();
	method public boolean isEmergencyEnabled();		method public boolean isEmergencyEnabled();

packages/SettingsLib/src/com/android/settingslib/mobile/MobileStatusTracker.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -231,7 +231,7 @@ public class MobileStatusTracker {
	public SignalStrength signalStrength;		public SignalStrength signalStrength;
	public TelephonyDisplayInfo telephonyDisplayInfo =		public TelephonyDisplayInfo telephonyDisplayInfo =
	new TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_UNKNOWN,		new TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_UNKNOWN,
	TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE);		TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE, false);

	/**		/**
	* Empty constructor		* Empty constructor

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -144,7 +144,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi
	private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);		private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
	private static final TelephonyDisplayInfo DEFAULT_TELEPHONY_DISPLAY_INFO =		private static final TelephonyDisplayInfo DEFAULT_TELEPHONY_DISPLAY_INFO =
	new TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_UNKNOWN,		new TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_UNKNOWN,
	TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE);		TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE, false);

	static final int MAX_WIFI_ENTRY_COUNT = 3;		static final int MAX_WIFI_ENTRY_COUNT = 3;

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileState.kt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,7 @@ internal class MobileState(
	) : ConnectivityState() {		) : ConnectivityState() {

	@JvmField var telephonyDisplayInfo = TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_UNKNOWN,		@JvmField var telephonyDisplayInfo = TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_UNKNOWN,
	TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE)		TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE, false)
	@JvmField var serviceState: ServiceState? = null		@JvmField var serviceState: ServiceState? = null
	@JvmField var signalStrength: SignalStrength? = null		@JvmField var signalStrength: SignalStrength? = null

	@@ -131,7 +131,7 @@ internal class MobileState(
	}		}

	fun isRoaming(): Boolean {		fun isRoaming(): Boolean {
	return serviceState != null && serviceState!!.roaming		return telephonyDisplayInfo != null && telephonyDisplayInfo.isRoaming
	}		}

	/**		/**