Merge "API review feedback changes" am: 84ea11384d (8d824a77) · Commits · e / os / android_frameworks_base

api/system-current.txt

+13 −15

Original line number	Diff line number	Diff line
		@@ -6034,15 +6034,14 @@ package android.telephony {
		field public static final String MBMS_STREAMING_SERVICE_ACTION = "android.telephony.action.EmbmsStreaming";
		}

		public class NetworkRegistrationInfo implements android.os.Parcelable {
		ctor public NetworkRegistrationInfo(int, int, int, int, int, boolean, @NonNull int[], @Nullable android.telephony.CellIdentity);
		public final class NetworkRegistrationInfo implements android.os.Parcelable {
		method public int describeContents();
		method public int getAccessNetworkTechnology();
		method @NonNull public int[] getAvailableServices();
		method @NonNull public java.util.List<java.lang.Integer> getAvailableServices();
		method @Nullable public android.telephony.CellIdentity getCellIdentity();
		method @Nullable public android.telephony.DataSpecificRegistrationStates getDataSpecificStates();
		method public int getDomain();
		method public int getRegState();
		method public int getRegistrationState();
		method public int getRejectCause();
		method public int getRoamingType();
		method public int getTransportType();
		@@ -6052,31 +6051,30 @@ package android.telephony {
		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_PS = 2; // 0x2
		field public static final int REG_STATE_DENIED = 3; // 0x3
		field public static final int REG_STATE_HOME = 1; // 0x1
		field public static final int REG_STATE_NOT_REG_NOT_SEARCHING = 0; // 0x0
		field public static final int REG_STATE_NOT_REG_SEARCHING = 2; // 0x2
		field public static final int REG_STATE_ROAMING = 5; // 0x5
		field public static final int REG_STATE_UNKNOWN = 4; // 0x4
		field public static final int REGISTRATION_STATE_DENIED = 3; // 0x3
		field public static final int REGISTRATION_STATE_HOME = 1; // 0x1
		field public static final int REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING = 0; // 0x0
		field public static final int REGISTRATION_STATE_NOT_REGISTERED_SEARCHING = 2; // 0x2
		field public static final int REGISTRATION_STATE_ROAMING = 5; // 0x5
		field public static final int REGISTRATION_STATE_UNKNOWN = 4; // 0x4
		field public static final int SERVICE_TYPE_DATA = 2; // 0x2
		field public static final int SERVICE_TYPE_EMERGENCY = 5; // 0x5
		field public static final int SERVICE_TYPE_SMS = 3; // 0x3
		field public static final int SERVICE_TYPE_UNKNOWN = 0; // 0x0
		field public static final int SERVICE_TYPE_VIDEO = 4; // 0x4
		field public static final int SERVICE_TYPE_VOICE = 1; // 0x1
		}

		public static class NetworkRegistrationInfo.Builder {
		public static final class NetworkRegistrationInfo.Builder {
		ctor public NetworkRegistrationInfo.Builder();
		method @NonNull public android.telephony.NetworkRegistrationInfo build();
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setAccessNetworkTechnology(int);
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setAvailableServices(@NonNull int[]);
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setAvailableServices(@NonNull java.util.List<java.lang.Integer>);
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setCellIdentity(@Nullable android.telephony.CellIdentity);
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setDomain(int);
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setEmergencyOnly(boolean);
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setNrStatus(int);
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setRegState(int);
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setRegistrationState(int);
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setRejectCause(int);
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setRoamingType(int);
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setTransportType(int);
		}

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -494,8 +494,8 @@ public class MobileSignalController extends SignalController<
		private MobileIconGroup getNr5GIconGroup() {
		if (mServiceState == null) return null;

		int nrStatus = mServiceState.getNrStatus();
		if (nrStatus == NetworkRegistrationInfo.NR_STATUS_CONNECTED) {
		int nrState = mServiceState.getNrState();
		if (nrState == NetworkRegistrationInfo.NR_STATE_CONNECTED) {
		// Check if the NR 5G is using millimeter wave and the icon is config.
		if (mServiceState.getNrFrequencyRange() == ServiceState.FREQUENCY_RANGE_MMWAVE) {
		if (mConfig.nr5GIconMap.containsKey(Config.NR_CONNECTED_MMWAVE)) {
		@@ -508,11 +508,11 @@ public class MobileSignalController extends SignalController<
		if (mConfig.nr5GIconMap.containsKey(Config.NR_CONNECTED)) {
		return mConfig.nr5GIconMap.get(Config.NR_CONNECTED);
		}
		} else if (nrStatus == NetworkRegistrationInfo.NR_STATUS_NOT_RESTRICTED) {
		} else if (nrState == NetworkRegistrationInfo.NR_STATE_NOT_RESTRICTED) {
		if (mConfig.nr5GIconMap.containsKey(Config.NR_NOT_RESTRICTED)) {
		return mConfig.nr5GIconMap.get(Config.NR_NOT_RESTRICTED);
		}
		} else if (nrStatus == NetworkRegistrationInfo.NR_STATUS_RESTRICTED) {
		} else if (nrState == NetworkRegistrationInfo.NR_STATE_RESTRICTED) {
		if (mConfig.nr5GIconMap.containsKey(Config.NR_RESTRICTED)) {
		return mConfig.nr5GIconMap.get(Config.NR_RESTRICTED);
		}

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_LTE);
		ServiceState ss = Mockito.mock(ServiceState.class);
		doReturn(NetworkRegistrationInfo.NR_STATUS_CONNECTED).when(ss).getNrStatus();
		doReturn(NetworkRegistrationInfo.NR_STATE_CONNECTED).when(ss).getNrState();
		doReturn(ServiceState.FREQUENCY_RANGE_HIGH).when(ss).getNrFrequencyRange();
		mPhoneStateListener.onServiceStateChanged(ss);

		@@ -165,7 +165,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_LTE);
		ServiceState ss = Mockito.mock(ServiceState.class);
		doReturn(NetworkRegistrationInfo.NR_STATUS_CONNECTED).when(ss).getNrStatus();
		doReturn(NetworkRegistrationInfo.NR_STATE_CONNECTED).when(ss).getNrState();
		doReturn(ServiceState.FREQUENCY_RANGE_MMWAVE).when(ss).getNrFrequencyRange();
		mPhoneStateListener.onServiceStateChanged(ss);

		@@ -179,7 +179,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_LTE);
		ServiceState ss = Mockito.mock(ServiceState.class);
		doReturn(NetworkRegistrationInfo.NR_STATUS_RESTRICTED).when(ss).getNrStatus();
		doReturn(NetworkRegistrationInfo.NR_STATE_RESTRICTED).when(ss).getNrState();
		mPhoneStateListener.onServiceStateChanged(mServiceState);

		verifyDataIndicators(TelephonyIcons.ICON_LTE);

telephony/java/android/telephony/NetworkRegistrationInfo.java

+147 −157

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/android/telephony/ServiceState.java

+26 −25

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import android.os.Parcelable;
		import android.telephony.AccessNetworkConstants.AccessNetworkType;
		import android.telephony.AccessNetworkConstants.TransportType;
		import android.telephony.NetworkRegistrationInfo.Domain;
		import android.telephony.NetworkRegistrationInfo.NRStatus;
		import android.telephony.NetworkRegistrationInfo.NRState;
		import android.text.TextUtils;

		import java.lang.annotation.Retention;
		@@ -650,7 +650,8 @@ public class ServiceState implements Parcelable {
		final NetworkRegistrationInfo regState = getNetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
		if (regState != null) {
		return (regState.getRegState() == NetworkRegistrationInfo.REG_STATE_ROAMING);
		return regState.getRegistrationState()
		== NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING;
		}
		return false;
		}
		@@ -1136,10 +1137,10 @@ public class ServiceState implements Parcelable {
		NetworkRegistrationInfo regState = getNetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
		if (regState == null) {
		regState = new NetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
		ServiceState.ROAMING_TYPE_NOT_ROAMING, TelephonyManager.NETWORK_TYPE_UNKNOWN, 0,
		false, null, null);
		regState = new NetworkRegistrationInfo.Builder()
		.setDomain(NetworkRegistrationInfo.DOMAIN_CS)
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.build();
		addNetworkRegistrationInfo(regState);
		}
		regState.setRoamingType(type);
		@@ -1157,10 +1158,10 @@ public class ServiceState implements Parcelable {
		NetworkRegistrationInfo regState = getNetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
		if (regState == null) {
		regState = new NetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
		ServiceState.ROAMING_TYPE_NOT_ROAMING, TelephonyManager.NETWORK_TYPE_UNKNOWN, 0,
		false, null, null);
		regState = new NetworkRegistrationInfo.Builder()
		.setDomain(NetworkRegistrationInfo.DOMAIN_PS)
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.build();
		addNetworkRegistrationInfo(regState);
		}
		regState.setRoamingType(type);
		@@ -1332,10 +1333,10 @@ public class ServiceState implements Parcelable {
		NetworkRegistrationInfo regState = getNetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
		if (regState == null) {
		regState = new NetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
		ServiceState.ROAMING_TYPE_NOT_ROAMING, TelephonyManager.NETWORK_TYPE_UNKNOWN,
		0, false, null, null);
		regState = new NetworkRegistrationInfo.Builder()
		.setDomain(NetworkRegistrationInfo.DOMAIN_CS)
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.build();
		addNetworkRegistrationInfo(regState);
		}
		regState.setAccessNetworkTechnology(
		@@ -1360,10 +1361,10 @@ public class ServiceState implements Parcelable {
		NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

		if (regState == null) {
		regState = new NetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
		ServiceState.ROAMING_TYPE_NOT_ROAMING, TelephonyManager.NETWORK_TYPE_UNKNOWN,
		0, false, null, null);
		regState = new NetworkRegistrationInfo.Builder()
		.setDomain(NetworkRegistrationInfo.DOMAIN_PS)
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.build();
		addNetworkRegistrationInfo(regState);
		}
		regState.setAccessNetworkTechnology(
		@@ -1389,15 +1390,15 @@ public class ServiceState implements Parcelable {
		}

		/**
		* Get the NR 5G status of the mobile data network.
		* @return the NR 5G status.
		* Get the NR 5G state of the mobile data network.
		* @return the NR 5G state.
		* @hide
		*/
		public @NRStatus int getNrStatus() {
		public @NRState int getNrState() {
		final NetworkRegistrationInfo regState = getNetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
		if (regState == null) return NetworkRegistrationInfo.NR_STATUS_NONE;
		return regState.getNrStatus();
		if (regState == null) return NetworkRegistrationInfo.NR_STATE_NONE;
		return regState.getNrState();
		}

		/**
		@@ -1581,8 +1582,8 @@ public class ServiceState implements Parcelable {
		public @TelephonyManager.NetworkType int getDataNetworkType() {
		final NetworkRegistrationInfo iwlanRegState = getNetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WLAN);
		if (iwlanRegState != null
		&& iwlanRegState.getRegState() == NetworkRegistrationInfo.REG_STATE_HOME) {
		if (iwlanRegState != null && iwlanRegState.getRegistrationState()
		== NetworkRegistrationInfo.REGISTRATION_STATE_HOME) {
		// If the device is on IWLAN, return IWLAN as the network type. This is to simulate the
		// behavior of legacy mode device. In the future caller should use
		// getNetworkRegistrationInfo() to retrieve the actual data network type on cellular