Merge "Always call processResponseDone() NATT Responses" (8b29c937) · Commits · e / os / android_frameworks_opt_telephony

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

+34 −35

Original line number	Diff line number	Diff line
		@@ -1313,13 +1313,10 @@ public class RadioResponse extends IRadioResponse.Stub {
		android.hardware.radio.V1_1.KeepaliveStatus keepaliveStatus) {

		RILRequest rr = mRil.processResponse(responseInfo);

		if (rr == null) {
		return;
		}
		if (rr == null) return;

		KeepaliveStatus ret = null;

		try {
		switch(responseInfo.error) {
		case RadioError.NONE:
		int convertedStatus = convertHalKeepaliveStatusCode(keepaliveStatus.code);
		@@ -1342,26 +1339,28 @@ public class RadioResponse extends IRadioResponse.Stub {
		ret = new KeepaliveStatus(KeepaliveStatus.ERROR_UNKNOWN);
		break;
		}
		} finally {
		// If responseInfo.error != NONE, the processResponseDone sends the response message.
		mRil.processResponseDone(rr, responseInfo, ret);
		}
		}

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		*/
		public void stopKeepaliveResponse(RadioResponseInfo responseInfo) {
		RILRequest rr = mRil.processResponse(responseInfo);
		if (rr == null) return;

		if (rr == null) {
		return;
		}

		try {
		if (responseInfo.error == RadioError.NONE) {
		sendMessageResponse(rr.mResult, null);
		mRil.processResponseDone(rr, responseInfo, null);
		} else {
		//TODO: Error code translation
		}
		} finally {
		mRil.processResponseDone(rr, responseInfo, null);
		}
		}

		private int convertHalKeepaliveStatusCode(int halCode) {