Merge "Renamed NetworkKeepalive back to its original name" (5431e7ab) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ import android.os.RemoteException;
		import android.telephony.PcoData;
		import android.telephony.data.DataCallResponse;

		import com.android.internal.telephony.data.NetworkKeepaliveStatus;
		import com.android.internal.telephony.data.KeepaliveStatus;

		import java.util.ArrayList;

		@@ -72,7 +72,7 @@ public class DataIndication extends IRadioDataIndication.Stub {
		+ " code=" + halStatus.code);
		}

		NetworkKeepaliveStatus ks = new NetworkKeepaliveStatus(
		KeepaliveStatus ks = new KeepaliveStatus(
		halStatus.sessionHandle, halStatus.code);
		mRil.mNattKeepaliveStatusRegistrants.notifyRegistrants(new AsyncResult(null, ks, null));
		}

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ import android.hardware.radio.data.IRadioDataResponse;
		import android.telephony.data.DataCallResponse;
		import android.telephony.data.NetworkSlicingConfig;

		import com.android.internal.telephony.data.NetworkKeepaliveStatus;
		import com.android.internal.telephony.data.KeepaliveStatus;

		import java.util.ArrayList;

		@@ -178,16 +178,16 @@ public class DataResponse extends IRadioDataResponse.Stub {
		RILRequest rr = mRil.processResponse(responseInfo);
		if (rr == null) return;

		NetworkKeepaliveStatus ret = null;
		KeepaliveStatus ret = null;
		try {
		switch(responseInfo.error) {
		case RadioError.NONE:
		int convertedStatus = RILUtils.convertHalKeepaliveStatusCode(
		keepaliveStatus.code);
		if (convertedStatus < 0) {
		ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_UNSUPPORTED);
		ret = new KeepaliveStatus(KeepaliveStatus.ERROR_UNSUPPORTED);
		} else {
		ret = new NetworkKeepaliveStatus(
		ret = new KeepaliveStatus(
		keepaliveStatus.sessionHandle, convertedStatus);
		}
		// If responseInfo.error is NONE, response function sends the response message
		@@ -195,13 +195,13 @@ public class DataResponse extends IRadioDataResponse.Stub {
		RadioResponse.sendMessageResponse(rr.mResult, ret);
		break;
		case RadioError.REQUEST_NOT_SUPPORTED:
		ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_UNSUPPORTED);
		ret = new KeepaliveStatus(KeepaliveStatus.ERROR_UNSUPPORTED);
		break;
		case RadioError.NO_RESOURCES:
		ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_NO_RESOURCES);
		ret = new KeepaliveStatus(KeepaliveStatus.ERROR_NO_RESOURCES);
		break;
		default:
		ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_UNKNOWN);
		ret = new KeepaliveStatus(KeepaliveStatus.ERROR_UNKNOWN);
		break;
		}
		} finally {

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -332,7 +332,8 @@ import com.android.internal.telephony.cdma.SmsMessage;
		import com.android.internal.telephony.cdma.sms.CdmaSmsAddress;
		import com.android.internal.telephony.cdma.sms.CdmaSmsSubaddress;
		import com.android.internal.telephony.cdma.sms.SmsEnvelope;
		import com.android.internal.telephony.data.NetworkKeepaliveStatus;
		import com.android.internal.telephony.data.KeepaliveStatus;
		import com.android.internal.telephony.data.KeepaliveStatus.KeepaliveStatusCode;
		import com.android.internal.telephony.uicc.AdnCapacity;
		import com.android.internal.telephony.uicc.IccCardApplicationStatus;
		import com.android.internal.telephony.uicc.IccCardStatus;
		@@ -3915,14 +3916,14 @@ public class RILUtils {
		* @param halCode KeepaliveStatus code defined in radio/1.1/types.hal or KeepaliveStatus.aidl
		* @return The converted KeepaliveStatus
		*/
		public static int convertHalKeepaliveStatusCode(int halCode) {
		public static @KeepaliveStatusCode int convertHalKeepaliveStatusCode(int halCode) {
		switch (halCode) {
		case android.hardware.radio.V1_1.KeepaliveStatusCode.ACTIVE:
		return NetworkKeepaliveStatus.STATUS_ACTIVE;
		return KeepaliveStatus.STATUS_ACTIVE;
		case android.hardware.radio.V1_1.KeepaliveStatusCode.INACTIVE:
		return NetworkKeepaliveStatus.STATUS_INACTIVE;
		return KeepaliveStatus.STATUS_INACTIVE;
		case android.hardware.radio.V1_1.KeepaliveStatusCode.PENDING:
		return NetworkKeepaliveStatus.STATUS_PENDING;
		return KeepaliveStatus.STATUS_PENDING;
		default:
		return -1;
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ import android.text.TextUtils;

		import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;
		import com.android.internal.telephony.cdma.CdmaInformationRecords;
		import com.android.internal.telephony.data.NetworkKeepaliveStatus;
		import com.android.internal.telephony.data.KeepaliveStatus;
		import com.android.internal.telephony.gsm.SsData;
		import com.android.internal.telephony.gsm.SuppServiceNotification;
		import com.android.internal.telephony.uicc.IccRefreshResponse;
		@@ -1046,7 +1046,7 @@ public class RadioIndication extends IRadioIndication.Stub {
		"handle=" + halStatus.sessionHandle + " code=" + halStatus.code);
		}

		NetworkKeepaliveStatus ks = new NetworkKeepaliveStatus(
		KeepaliveStatus ks = new KeepaliveStatus(
		halStatus.sessionHandle, halStatus.code);
		mRil.mNattKeepaliveStatusRegistrants.notifyRegistrants(new AsyncResult(null, ks, null));
		}

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ import android.telephony.data.DataCallResponse;
		import android.telephony.data.NetworkSlicingConfig;
		import android.text.TextUtils;

		import com.android.internal.telephony.data.NetworkKeepaliveStatus;
		import com.android.internal.telephony.data.KeepaliveStatus;
		import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;
		import com.android.internal.telephony.uicc.AdnCapacity;
		import com.android.internal.telephony.uicc.IccCardStatus;
		@@ -1783,16 +1783,16 @@ public class RadioResponse extends IRadioResponse.Stub {
		RILRequest rr = mRil.processResponse(responseInfo);
		if (rr == null) return;

		NetworkKeepaliveStatus ret = null;
		KeepaliveStatus ret = null;
		try {
		switch(responseInfo.error) {
		case RadioError.NONE:
		int convertedStatus = RILUtils.convertHalKeepaliveStatusCode(
		keepaliveStatus.code);
		if (convertedStatus < 0) {
		ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_UNSUPPORTED);
		ret = new KeepaliveStatus(KeepaliveStatus.ERROR_UNSUPPORTED);
		} else {
		ret = new NetworkKeepaliveStatus(
		ret = new KeepaliveStatus(
		keepaliveStatus.sessionHandle, convertedStatus);
		}
		// If responseInfo.error is NONE, response function sends the response message
		@@ -1800,13 +1800,13 @@ public class RadioResponse extends IRadioResponse.Stub {
		sendMessageResponse(rr.mResult, ret);
		break;
		case RadioError.REQUEST_NOT_SUPPORTED:
		ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_UNSUPPORTED);
		ret = new KeepaliveStatus(KeepaliveStatus.ERROR_UNSUPPORTED);
		break;
		case RadioError.NO_RESOURCES:
		ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_NO_RESOURCES);
		ret = new KeepaliveStatus(KeepaliveStatus.ERROR_NO_RESOURCES);
		break;
		default:
		ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_UNKNOWN);
		ret = new KeepaliveStatus(KeepaliveStatus.ERROR_UNKNOWN);
		break;
		}
		} finally {