Merge "Integrate emergencyDial 1.6 in telephony" (f8a10fb6) · Commits · e / os / android_frameworks_opt_telephony

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

+28 −10

Original line number	Diff line number	Diff line
		@@ -1335,12 +1335,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}

		private void emergencyDial(String address, EmergencyNumber emergencyNumberInfo,
		boolean hasKnownUserIntentEmergency, int clirMode, UUSInfo uusInfo,
		Message result) {
		boolean hasKnownUserIntentEmergency, int clirMode, UUSInfo uusInfo, Message result) {
		IRadio radioProxy = getRadioProxy(result);
		// IRadio V1.4
		android.hardware.radio.V1_4.IRadio radioProxy14 =
		(android.hardware.radio.V1_4.IRadio) radioProxy;
		if (radioProxy != null) {
		RILRequest rr = obtainRequest(RIL_REQUEST_EMERGENCY_DIAL, result,
		mRILDefaultWorkSource);
		@@ -1360,6 +1356,25 @@ public class RIL extends BaseCommands implements CommandsInterface {
		riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
		}

		if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_6)) {
		android.hardware.radio.V1_6.IRadio radioProxy16 =
		(android.hardware.radio.V1_6.IRadio) radioProxy;
		try {
		radioProxy16.emergencyDial_1_6(rr.mSerial, dialInfo,
		emergencyNumberInfo.getEmergencyServiceCategoryBitmaskInternalDial(),
		emergencyNumberInfo.getEmergencyUrns() != null
		? new ArrayList(emergencyNumberInfo.getEmergencyUrns())
		: new ArrayList<>(),
		emergencyNumberInfo.getEmergencyCallRouting(),
		hasKnownUserIntentEmergency,
		emergencyNumberInfo.getEmergencyNumberSourceBitmask()
		== EmergencyNumber.EMERGENCY_NUMBER_SOURCE_TEST);
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "emergencyDial_1_6", e);
		}
		} else if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_4)) {
		android.hardware.radio.V1_4.IRadio radioProxy14 =
		(android.hardware.radio.V1_4.IRadio) radioProxy;
		try {
		radioProxy14.emergencyDial(rr.mSerial, dialInfo,
		emergencyNumberInfo.getEmergencyServiceCategoryBitmaskInternalDial(),
		@@ -1373,6 +1388,9 @@ public class RIL extends BaseCommands implements CommandsInterface {
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "emergencyDial", e);
		}
		} else {
		riljLoge("emergencyDial is not supported with 1.4 below IRadio");
		}
		}
		}