Merge "Add {set/get}AllowedNetworkTypeBitmask" (68884732) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/CommandsInterface.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -1555,6 +1555,22 @@ public interface CommandsInterface {
		@UnsupportedAppUsage
		void getPreferredNetworkType(Message response);

		/**
		* Requests to set the allowed network types for searching and registering.
		*
		* @param networkTypeBitmask {@link TelephonyManager.NetworkTypeBitMask}
		* @param response is callback message
		*/
		void setAllowedNetworkTypeBitmask(
		@TelephonyManager.NetworkTypeBitMask int networkTypeBitmask, Message response);

		/**
		* Query the allowed network types setting.
		*
		* @param response is callback message to report one of NT_*_TYPE
		*/
		void getAllowedNetworkTypeBitmask(Message response);

		/**
		* Enable/Disable E-UTRA-NR Dual Connectivity
		* @param nrDualConnectivityState expected NR dual connectivity state

src/java/com/android/internal/telephony/RIL.java

+61 −0

Original line number	Diff line number	Diff line
		@@ -3438,6 +3438,67 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}
		}

		@Override
		public void setAllowedNetworkTypeBitmask(
		@TelephonyManager.NetworkTypeBitMask int networkTypeBitmask, Message result) {
		IRadio radioProxy = getRadioProxy(result);
		if (radioProxy != null) {
		if (mRadioVersion.less(RADIO_HAL_VERSION_1_6)) {
		if (result != null) {
		AsyncResult.forMessage(result, null,
		CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
		result.sendToTarget();
		}
		return;
		}

		android.hardware.radio.V1_6.IRadio radioProxy16 =
		(android.hardware.radio.V1_6.IRadio) radioProxy;
		RILRequest rr = obtainRequest(RIL_REQUEST_SET_ALLOWED_NETWORK_TYPE_BITMAP, result,
		mRILDefaultWorkSource);

		if (RILJ_LOGD) {
		riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
		}

		try {
		radioProxy16.setAllowedNetworkTypeBitmap(rr.mSerial, networkTypeBitmask);
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "setAllowedNetworkTypeBitmask", e);
		}
		}
		}

		@Override
		public void getAllowedNetworkTypeBitmask(Message result) {
		IRadio radioProxy = getRadioProxy(result);
		if (radioProxy != null) {
		if (mRadioVersion.less(RADIO_HAL_VERSION_1_6)) {
		if (result != null) {
		AsyncResult.forMessage(result, null,
		CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
		result.sendToTarget();
		}
		return;
		}

		android.hardware.radio.V1_6.IRadio radioProxy16 =
		(android.hardware.radio.V1_6.IRadio) radioProxy;
		RILRequest rr = obtainRequest(RIL_REQUEST_GET_ALLOWED_NETWORK_TYPE_BITMAP, result,
		mRILDefaultWorkSource);

		if (RILJ_LOGD) {
		riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
		}

		try {
		radioProxy16.getAllowedNetworkTypeBitmap(rr.mSerial);
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "getAllowedNetworkTypeBitmask", e);
		}
		}
		}

		@Override
		public void setLocationUpdates(boolean enable, WorkSource workSource, Message result) {
		IRadio radioProxy = getRadioProxy(result);

src/java/com/android/internal/telephony/imsphone/ImsPhoneCommandInterface.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.os.Message;
		import android.telephony.ImsiEncryptionInfo;
		import android.telephony.NetworkScanRequest;
		import android.telephony.SignalThresholdInfo;
		import android.telephony.TelephonyManager;
		import android.telephony.data.DataProfile;
		import android.telephony.emergency.EmergencyNumber;

		@@ -454,6 +455,15 @@ class ImsPhoneCommandInterface extends BaseCommands implements CommandsInterface
		public void getPreferredNetworkType(Message response) {
		}

		@Override
		public void setAllowedNetworkTypeBitmask(
		@TelephonyManager.NetworkTypeBitMask int networkTypeBitmask, Message response) {
		}

		@Override
		public void getAllowedNetworkTypeBitmask(Message response) {
		}

		@Override
		public void setLocationUpdates(boolean enable, Message response) {
		}

src/java/com/android/internal/telephony/sip/SipCommandInterface.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.os.Message;
		import android.telephony.ImsiEncryptionInfo;
		import android.telephony.NetworkScanRequest;
		import android.telephony.SignalThresholdInfo;
		import android.telephony.TelephonyManager;
		import android.telephony.data.DataProfile;
		import android.telephony.emergency.EmergencyNumber;

		@@ -455,6 +456,15 @@ class SipCommandInterface extends BaseCommands implements CommandsInterface {
		public void getPreferredNetworkType(Message response) {
		}

		@Override
		public void setAllowedNetworkTypeBitmask(
		@TelephonyManager.NetworkTypeBitMask int networkTypeBitmask, Message response) {
		}

		@Override
		public void getAllowedNetworkTypeBitmask(Message response) {
		}

		@Override
		public void setLocationUpdates(boolean enable, Message response) {
		}

tests/telephonytests/src/com/android/internal/telephony/SimulatedCommands.java

+22 −3

Original line number	Diff line number	Diff line
		@@ -136,7 +136,8 @@ public class SimulatedCommands extends BaseCommands
		boolean mSimFdnEnabled;
		int mPin2UnlockAttempts;
		int mPuk2UnlockAttempts;
		int mNetworkType;
		int mPreferredNetworkType;
		int mAllowedNetworkType;
		String mPin2Code;
		boolean mSsnNotifyOn = false;
		private int mVoiceRegState = NetworkRegistrationInfo.REGISTRATION_STATE_HOME;
		@@ -1227,7 +1228,7 @@ public class SimulatedCommands extends BaseCommands
		@Override
		public void setPreferredNetworkType(int networkType , Message result) {
		SimulatedCommandsVerifier.getInstance().setPreferredNetworkType(networkType, result);
		mNetworkType = networkType;
		mPreferredNetworkType = networkType;
		resultSuccess(result, null);
		}

		@@ -1236,10 +1237,28 @@ public class SimulatedCommands extends BaseCommands
		SimulatedCommandsVerifier.getInstance().getPreferredNetworkType(result);
		int ret[] = new int[1];

		ret[0] = mNetworkType;
		ret[0] = mPreferredNetworkType;
		resultSuccess(result, ret);
		}

		@Override
		public void setAllowedNetworkTypeBitmask(
		@TelephonyManager.NetworkTypeBitMask int networkTypeBitmask, Message response) {
		SimulatedCommandsVerifier.getInstance()
		.setAllowedNetworkTypeBitmask(networkTypeBitmask, response);
		mAllowedNetworkType = networkTypeBitmask;
		resultSuccess(response, null);
		}

		@Override
		public void getAllowedNetworkTypeBitmask(Message response) {
		SimulatedCommandsVerifier.getInstance().getAllowedNetworkTypeBitmask(response);
		int[] ret = new int[1];

		ret[0] = mAllowedNetworkType;
		resultSuccess(response, ret);
		}

		@Override
		public void setLocationUpdates(boolean enable, Message response) {
		SimulatedCommandsVerifier.getInstance().setLocationUpdates(enable, response);