Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7ca7931 authored by Jack Yu's avatar Jack Yu
Browse files

Migrated keepalive tracker to the new data stack 

Separated keepalive tracker from DcNetworkAgent. No
logic changed.

Test: Manual
Bug: 196597630
Merged-In: Idfb3423e3908944737ba1c1d4a6602e53ec7d467
Change-Id: Idfb3423e3908944737ba1c1d4a6602e53ec7d467
parent f164a0fd

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

+3 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import android.telephony.data.DataCallResponse; 
import android.telephony.data.DataProfile;

import android.telephony.data.NetworkSlicingConfig;



import com.android.internal.telephony.dataconnection.KeepaliveStatus;

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



import java.util.ArrayList;
@@ -75,7 +75,8 @@ public class DataIndication extends IRadioDataIndication.Stub { 
                    + " code=" +  halStatus.code);

        }



        KeepaliveStatus ks = new KeepaliveStatus(halStatus.sessionHandle, halStatus.code);

        NetworkKeepaliveStatus ks = new NetworkKeepaliveStatus(

                halStatus.sessionHandle, halStatus.code);

        mRil.mNattKeepaliveStatusRegistrants.notifyRegistrants(new AsyncResult(null, ks, null));

    }

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

+8 −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.dataconnection.KeepaliveStatus;

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



import java.util.ArrayList;
@@ -178,29 +178,30 @@ public class DataResponse extends IRadioDataResponse.Stub { 
        RILRequest rr = mRil.processResponse(RIL.DATA_SERVICE, responseInfo);

        if (rr == null) return;



        KeepaliveStatus ret = null;

        NetworkKeepaliveStatus ret = null;

        try {

            switch(responseInfo.error) {

                case RadioError.NONE:

                    int convertedStatus = RILUtils.convertHalKeepaliveStatusCode(

                            keepaliveStatus.code);

                    if (convertedStatus < 0) {

                        ret = new KeepaliveStatus(KeepaliveStatus.ERROR_UNSUPPORTED);

                        ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_UNSUPPORTED);

                    } else {

                        ret = new KeepaliveStatus(keepaliveStatus.sessionHandle, convertedStatus);

                        ret = new NetworkKeepaliveStatus(

                                keepaliveStatus.sessionHandle, convertedStatus);

                    }

                    // If responseInfo.error is NONE, response function sends the response message

                    // even if result is actually an error.

                    RadioResponse.sendMessageResponse(rr.mResult, ret);

                    break;

                case RadioError.REQUEST_NOT_SUPPORTED:

                    ret = new KeepaliveStatus(KeepaliveStatus.ERROR_UNSUPPORTED);

                    ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_UNSUPPORTED);

                    break;

                case RadioError.NO_RESOURCES:

                    ret = new KeepaliveStatus(KeepaliveStatus.ERROR_NO_RESOURCES);

                    ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_NO_RESOURCES);

                    break;

                default:

                    ret = new KeepaliveStatus(KeepaliveStatus.ERROR_UNKNOWN);

                    ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_UNKNOWN);

                    break;

            }

        } finally {

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

+4 −4
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ 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.dataconnection.KeepaliveStatus;

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

import com.android.internal.telephony.uicc.AdnCapacity;

import com.android.internal.telephony.uicc.IccCardApplicationStatus;

import com.android.internal.telephony.uicc.IccCardStatus;
@@ -3962,11 +3962,11 @@ public class RILUtils { 
    public static int convertHalKeepaliveStatusCode(int halCode) {

        switch (halCode) {

            case android.hardware.radio.V1_1.KeepaliveStatusCode.ACTIVE:

                return KeepaliveStatus.STATUS_ACTIVE;

                return NetworkKeepaliveStatus.STATUS_ACTIVE;

            case android.hardware.radio.V1_1.KeepaliveStatusCode.INACTIVE:

                return KeepaliveStatus.STATUS_INACTIVE;

                return NetworkKeepaliveStatus.STATUS_INACTIVE;

            case android.hardware.radio.V1_1.KeepaliveStatusCode.PENDING:

                return KeepaliveStatus.STATUS_PENDING;

                return NetworkKeepaliveStatus.STATUS_PENDING;

            default:

                return -1;

        }

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

+3 −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.dataconnection.KeepaliveStatus;

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

import com.android.internal.telephony.gsm.SsData;

import com.android.internal.telephony.gsm.SuppServiceNotification;

import com.android.internal.telephony.uicc.IccRefreshResponse;
@@ -1046,7 +1046,8 @@ public class RadioIndication extends IRadioIndication.Stub { 
                    "handle=" + halStatus.sessionHandle + " code=" +  halStatus.code);

        }



        KeepaliveStatus ks = new KeepaliveStatus(halStatus.sessionHandle, halStatus.code);

        NetworkKeepaliveStatus ks = new NetworkKeepaliveStatus(

                halStatus.sessionHandle, halStatus.code);

        mRil.mNattKeepaliveStatusRegistrants.notifyRegistrants(new AsyncResult(null, ks, null));

    }

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

+8 −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.dataconnection.KeepaliveStatus;

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

import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;

import com.android.internal.telephony.uicc.AdnCapacity;

import com.android.internal.telephony.uicc.IccCardStatus;
@@ -1783,29 +1783,30 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        if (rr == null) return;



        KeepaliveStatus ret = null;

        NetworkKeepaliveStatus ret = null;

        try {

            switch(responseInfo.error) {

                case RadioError.NONE:

                    int convertedStatus = RILUtils.convertHalKeepaliveStatusCode(

                            keepaliveStatus.code);

                    if (convertedStatus < 0) {

                        ret = new KeepaliveStatus(KeepaliveStatus.ERROR_UNSUPPORTED);

                        ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_UNSUPPORTED);

                    } else {

                        ret = new KeepaliveStatus(keepaliveStatus.sessionHandle, convertedStatus);

                        ret = new NetworkKeepaliveStatus(

                                keepaliveStatus.sessionHandle, convertedStatus);

                    }

                    // If responseInfo.error is NONE, response function sends the response message

                    // even if result is actually an error.

                    sendMessageResponse(rr.mResult, ret);

                    break;

                case RadioError.REQUEST_NOT_SUPPORTED:

                    ret = new KeepaliveStatus(KeepaliveStatus.ERROR_UNSUPPORTED);

                    ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_UNSUPPORTED);

                    break;

                case RadioError.NO_RESOURCES:

                    ret = new KeepaliveStatus(KeepaliveStatus.ERROR_NO_RESOURCES);

                    ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_NO_RESOURCES);

                    break;

                default:

                    ret = new KeepaliveStatus(KeepaliveStatus.ERROR_UNKNOWN);

                    ret = new NetworkKeepaliveStatus(NetworkKeepaliveStatus.ERROR_UNKNOWN);

                    break;

            }

        } finally {