Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" am: 936c536bba (dc025370) · Commits · e / os / android_frameworks_base

api/system-current.txt

+23 −25

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

		public class NetworkRegistrationState implements android.os.Parcelable {
		ctor public NetworkRegistrationState(int, int, int, int, int, boolean, @NonNull int[], @Nullable android.telephony.CellIdentity);
		public class NetworkRegistrationInfo implements android.os.Parcelable {
		ctor public NetworkRegistrationInfo(int, int, int, int, int, boolean, @NonNull int[], @Nullable android.telephony.CellIdentity);
		method public int describeContents();
		method public int getAccessNetworkTechnology();
		method @NonNull public int[] getAvailableServices();
		@@ -6049,7 +6049,7 @@ package android.telephony {
		method public boolean isEmergencyEnabled();
		method public boolean isRoaming();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telephony.NetworkRegistrationState> 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_PS = 2; // 0x2
		field public static final int REG_STATE_DENIED = 3; // 0x3
		@@ -6065,19 +6065,19 @@ package android.telephony {
		field public static final int SERVICE_TYPE_VOICE = 1; // 0x1
		}

		public static class NetworkRegistrationState.Builder {
		ctor public NetworkRegistrationState.Builder();
		method @NonNull public android.telephony.NetworkRegistrationState build();
		method @NonNull public android.telephony.NetworkRegistrationState.Builder setAccessNetworkTechnology(int);
		method @NonNull public android.telephony.NetworkRegistrationState.Builder setAvailableServices(@NonNull int[]);
		method @NonNull public android.telephony.NetworkRegistrationState.Builder setCellIdentity(@Nullable android.telephony.CellIdentity);
		method @NonNull public android.telephony.NetworkRegistrationState.Builder setDomain(int);
		method @NonNull public android.telephony.NetworkRegistrationState.Builder setEmergencyOnly(boolean);
		method @NonNull public android.telephony.NetworkRegistrationState.Builder setNrStatus(int);
		method @NonNull public android.telephony.NetworkRegistrationState.Builder setRegState(int);
		method @NonNull public android.telephony.NetworkRegistrationState.Builder setRejectCause(int);
		method @NonNull public android.telephony.NetworkRegistrationState.Builder setRoamingType(int);
		method @NonNull public android.telephony.NetworkRegistrationState.Builder setTransportType(int);
		public static 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 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 setRejectCause(int);
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setRoamingType(int);
		method @NonNull public android.telephony.NetworkRegistrationInfo.Builder setTransportType(int);
		}

		public abstract class NetworkService extends android.app.Service {
		@@ -6090,13 +6090,13 @@ package android.telephony {
		public abstract class NetworkService.NetworkServiceProvider implements java.lang.AutoCloseable {
		ctor public NetworkService.NetworkServiceProvider(int);
		method public abstract void close();
		method public void getNetworkRegistrationState(int, @NonNull android.telephony.NetworkServiceCallback);
		method public void getNetworkRegistrationInfo(int, @NonNull android.telephony.NetworkServiceCallback);
		method public final int getSlotIndex();
		method public final void notifyNetworkRegistrationStateChanged();
		method public final void notifyNetworkRegistrationInfoChanged();
		}

		public class NetworkServiceCallback {
		method public void onGetNetworkRegistrationStateComplete(int, @Nullable android.telephony.NetworkRegistrationState);
		method public void onGetNetworkRegistrationInfoComplete(int, @Nullable android.telephony.NetworkRegistrationInfo);
		field public static final int RESULT_ERROR_BUSY = 3; // 0x3
		field public static final int RESULT_ERROR_FAILED = 5; // 0x5
		field public static final int RESULT_ERROR_ILLEGAL_STATE = 4; // 0x4
		@@ -6271,12 +6271,10 @@ package android.telephony {
		}

		public class ServiceState implements android.os.Parcelable {
		method @Nullable public android.telephony.NetworkRegistrationState getNetworkRegistrationState(int, int);
		method @NonNull public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates();
		method @Deprecated @NonNull public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates(int);
		method @Deprecated @Nullable public android.telephony.NetworkRegistrationState getNetworkRegistrationStates(int, int);
		method @NonNull public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesForDomain(int);
		method @NonNull public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesForTransportType(int);
		method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int);
		method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();
		method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForDomain(int);
		method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(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

packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ import android.os.UserHandle;
		import android.provider.Settings;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.CellSignalStrength;
		import android.telephony.NetworkRegistrationState;
		import android.telephony.NetworkRegistrationInfo;
		import android.telephony.ServiceState;
		import android.telephony.SignalStrength;
		import android.telephony.TelephonyManager;
		@@ -1615,8 +1615,8 @@ public class NetworkMonitor extends StateMachine {
		return;
		}
		// See if the data sub is registered for PS services on cell.
		final NetworkRegistrationState nrs = dataSs.getNetworkRegistrationState(
		NetworkRegistrationState.DOMAIN_PS,
		final NetworkRegistrationInfo nrs = dataSs.getNetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS,
		AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
		latencyBroadcast.putExtra(
		NetworkMonitorUtils.EXTRA_CELL_ID,

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ import android.net.NetworkCapabilities;
		import android.os.Handler;
		import android.os.Looper;
		import android.provider.Settings.Global;
		import android.telephony.NetworkRegistrationState;
		import android.telephony.NetworkRegistrationInfo;
		import android.telephony.PhoneStateListener;
		import android.telephony.ServiceState;
		import android.telephony.SignalStrength;
		@@ -495,7 +495,7 @@ public class MobileSignalController extends SignalController<
		if (mServiceState == null) return null;

		int nrStatus = mServiceState.getNrStatus();
		if (nrStatus == NetworkRegistrationState.NR_STATUS_CONNECTED) {
		if (nrStatus == NetworkRegistrationInfo.NR_STATUS_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 == NetworkRegistrationState.NR_STATUS_NOT_RESTRICTED) {
		} else if (nrStatus == NetworkRegistrationInfo.NR_STATUS_NOT_RESTRICTED) {
		if (mConfig.nr5GIconMap.containsKey(Config.NR_NOT_RESTRICTED)) {
		return mConfig.nr5GIconMap.get(Config.NR_NOT_RESTRICTED);
		}
		} else if (nrStatus == NetworkRegistrationState.NR_STATUS_RESTRICTED) {
		} else if (nrStatus == NetworkRegistrationInfo.NR_STATUS_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

+4 −4

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ import static org.mockito.Mockito.when;

		import android.net.NetworkCapabilities;
		import android.os.Looper;
		import android.telephony.NetworkRegistrationState;
		import android.telephony.NetworkRegistrationInfo;
		import android.telephony.ServiceState;
		import android.telephony.TelephonyManager;
		import android.test.suitebuilder.annotation.SmallTest;
		@@ -151,7 +151,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
		updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
		TelephonyManager.NETWORK_TYPE_LTE);
		ServiceState ss = Mockito.mock(ServiceState.class);
		doReturn(NetworkRegistrationState.NR_STATUS_CONNECTED).when(ss).getNrStatus();
		doReturn(NetworkRegistrationInfo.NR_STATUS_CONNECTED).when(ss).getNrStatus();
		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(NetworkRegistrationState.NR_STATUS_CONNECTED).when(ss).getNrStatus();
		doReturn(NetworkRegistrationInfo.NR_STATUS_CONNECTED).when(ss).getNrStatus();
		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(NetworkRegistrationState.NR_STATUS_RESTRICTED).when(ss).getNrStatus();
		doReturn(NetworkRegistrationInfo.NR_STATUS_RESTRICTED).when(ss).getNrStatus();
		mPhoneStateListener.onServiceStateChanged(mServiceState);

		verifyDataIndicators(TelephonyIcons.ICON_LTE);

telephony/java/android/telephony/INetworkService.aidl

+3 −3

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ oneway interface INetworkService
		{
		void createNetworkServiceProvider(int slotId);
		void removeNetworkServiceProvider(int slotId);
		void getNetworkRegistrationState(int slotId, int domain, INetworkServiceCallback callback);
		void registerForNetworkRegistrationStateChanged(int slotId, INetworkServiceCallback callback);
		void unregisterForNetworkRegistrationStateChanged(int slotId, INetworkServiceCallback callback);
		void getNetworkRegistrationInfo(int slotId, int domain, INetworkServiceCallback callback);
		void registerForNetworkRegistrationInfoChanged(int slotId, INetworkServiceCallback callback);
		void unregisterForNetworkRegistrationInfoChanged(int slotId, INetworkServiceCallback callback);
		}