Merge "new SystemAPI for roamingType in NetworkRegistrationState" am: 24df195e78 am: 0c9e00dd03 (e2cecc8c) · Commits · e / os / android_frameworks_base

api/system-current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -5476,6 +5476,7 @@ package android.telephony {
		method public int getDomain();
		method public int getRegState();
		method public int getRejectCause();
		method public int getRoamingType();
		method public int getTransportType();
		method public boolean isEmergencyEnabled();
		method public boolean isRoaming();
		@@ -5535,6 +5536,10 @@ package android.telephony {
		method public deprecated android.telephony.NetworkRegistrationState getNetworkRegistrationStates(int, int);
		method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesForDomain(int);
		method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesForTransportType(int);
		field public static final int ROAMING_TYPE_DOMESTIC = 2; // 0x2
		field public static final int ROAMING_TYPE_INTERNATIONAL = 3; // 0x3
		field public static final int ROAMING_TYPE_NOT_ROAMING = 0; // 0x0
		field public static final int ROAMING_TYPE_UNKNOWN = 1; // 0x1
		}

		public final class SmsManager {

+2 −3

Original line number	Diff line number	Diff line
		@@ -237,10 +237,9 @@ public class NetworkRegistrationState implements Parcelable {
		}

		/**
		* @return {@link ServiceState.RoamingType roaming type}. This could return
		* overridden roaming type based on resource overlay or carrier config.
		* @hide
		* @return the current network roaming type.
		*/

		public @ServiceState.RoamingType int getRoamingType() {
		return mRoamingType;
		}

+9 −8

Original line number	Diff line number	Diff line
		@@ -211,29 +211,30 @@ public class ServiceState implements Parcelable {
		ROAMING_TYPE_INTERNATIONAL
		})
		public @interface RoamingType {}

		/**
		* Roaming type
		* HOME : in home network
		* Not roaming, registered in home network.
		* @hide
		*/
		@SystemApi
		public static final int ROAMING_TYPE_NOT_ROAMING = 0;
		/**
		* Roaming type
		* UNKNOWN : in a roaming network, but we can not tell if it's domestic or international
		* registered in a roaming network, but can not tell if it's domestic or international.
		* @hide
		*/
		@SystemApi
		public static final int ROAMING_TYPE_UNKNOWN = 1;
		/**
		* Roaming type
		* DOMESTIC : in domestic roaming network
		* registered in a domestic roaming network
		* @hide
		*/
		@SystemApi
		public static final int ROAMING_TYPE_DOMESTIC = 2;
		/**
		* Roaming type
		* INTERNATIONAL : in international roaming network
		* registered in an international roaming network
		* @hide
		*/
		@SystemApi
		public static final int ROAMING_TYPE_INTERNATIONAL = 3;

		/**