Merge "Don't obtain ril request if request not supported" (9f2802fe) · Commits · e / os / android_frameworks_opt_telephony

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

+9 −8

Original line number	Original line	Diff line number	Diff line
	@@ -3526,14 +3526,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
	public void isNrDualConnectivityEnabled(Message result, WorkSource workSource) {		public void isNrDualConnectivityEnabled(Message result, WorkSource workSource) {
	IRadio radioProxy = getRadioProxy(result);		IRadio radioProxy = getRadioProxy(result);
	if (radioProxy != null) {		if (radioProxy != null) {
	RILRequest rr = obtainRequest(RIL_REQUEST_IS_NR_DUAL_CONNECTIVITY_ENABLED, result,
	workSource == null ? mRILDefaultWorkSource : workSource);

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

	if (mRadioVersion.less(RADIO_HAL_VERSION_1_6)) {		if (mRadioVersion.less(RADIO_HAL_VERSION_1_6)) {
	if (result != null) {		if (result != null) {
	AsyncResult.forMessage(result, null,		AsyncResult.forMessage(result, null,
	@@ -3545,6 +3537,15 @@ public class RIL extends BaseCommands implements CommandsInterface {

	android.hardware.radio.V1_6.IRadio radioProxy16 =		android.hardware.radio.V1_6.IRadio radioProxy16 =
	(android.hardware.radio.V1_6.IRadio) radioProxy;		(android.hardware.radio.V1_6.IRadio) radioProxy;

			RILRequest rr = obtainRequest(RIL_REQUEST_IS_NR_DUAL_CONNECTIVITY_ENABLED, result,
			workSource == null ? mRILDefaultWorkSource : workSource);

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

	try {		try {
	radioProxy16.isNrDualConnectivityEnabled(rr.mSerial);		radioProxy16.isNrDualConnectivityEnabled(rr.mSerial);
	} catch (RemoteException \| RuntimeException e) {		} catch (RemoteException \| RuntimeException e) {