Smdk4210RIL: fix emergency dialing (bcead58e) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/Smdk4210RIL.java

+53 −0

Original line number	Diff line number	Diff line
		@@ -161,6 +161,14 @@ public class Smdk4210RIL extends RIL implements CommandsInterface {
		mQANElements = 5;
		}

		static String
		requestToString(int request) {
		switch (request) {
		case RIL_REQUEST_DIAL_EMERGENCY: return "DIAL_EMERGENCY";
		default: return RIL.requestToString(request);
		}
		}

		@Override
		public void setCurrentPreferredNetworkType() {
		if (RILJ_LOGD) riljLog("setCurrentPreferredNetworkType IGNORED");
		@@ -496,6 +504,7 @@ public class Smdk4210RIL extends RIL implements CommandsInterface {
		case RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU: ret = responseVoid(p); break;
		case RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS: ret = responseICC_IO(p); break;
		case RIL_REQUEST_VOICE_RADIO_TECH: ret = responseInts(p); break;
		case RIL_REQUEST_DIAL_EMERGENCY: ret = responseVoid(p); break;
		default:
		throw new RuntimeException("Unrecognized solicited response: " + rr.mRequest);
		//break;
		@@ -548,6 +557,50 @@ public class Smdk4210RIL extends RIL implements CommandsInterface {
		rr.release();
		}

		@Override
		public void
		dial(String address, int clirMode, UUSInfo uusInfo, Message result) {
		RILRequest rr;
		if (PhoneNumberUtils.isEmergencyNumber(address)) {
		dialEmergencyCall(address, clirMode, result);
		return;
		}

		rr = RILRequest.obtain(RIL_REQUEST_DIAL, result);
		rr.mp.writeString(address);
		rr.mp.writeInt(clirMode);
		rr.mp.writeInt(0); // UUS information is absent

		if (uusInfo == null) {
		rr.mp.writeInt(0); // UUS information is absent
		} else {
		rr.mp.writeInt(1); // UUS information is present
		rr.mp.writeInt(uusInfo.getType());
		rr.mp.writeInt(uusInfo.getDcs());
		rr.mp.writeByteArray(uusInfo.getUserData());
		}

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

		send(rr);
		}

		public void
		dialEmergencyCall(String address, int clirMode, Message result) {
		RILRequest rr;
		Log.v(LOG_TAG, "Emergency dial: " + address);

		rr = RILRequest.obtain(RIL_REQUEST_DIAL_EMERGENCY, result);
		rr.mp.writeString(address + "/");
		rr.mp.writeInt(clirMode);
		rr.mp.writeInt(0);
		rr.mp.writeInt(0);

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

		send(rr);
		}

		@Override
		protected void
		processUnsolicited (Parcel p) {