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

Commit 3266b0d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "data_refactoring" 

* changes:
  Implement DataSettingsManager
  Moved AccessNetworksManager to the new package
  Moved AccessNetworksManager to the new data package
  Renamed NetworkKeepalive back to its original name
  Add Data Stall Recovery Mechanism
parents 4a3ecd2e b905211c

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

+2 −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.data.NetworkKeepaliveStatus;

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



import java.util.ArrayList;
@@ -75,7 +75,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(RIL.DATA_SERVICE, 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/GsmCdmaPhone.java

+1 −1
Original line number Diff line number Diff line
@@ -90,9 +90,9 @@ import com.android.ims.ImsManager; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.cdma.CdmaMmiCode;

import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;

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

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

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

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

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

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -76,9 +76,9 @@ import com.android.ims.ImsException; 
import com.android.ims.ImsManager;

import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

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

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

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

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

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

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

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

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

+6 −5
Original line number Diff line number Diff line
@@ -333,7 +333,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;
@@ -3959,14 +3960,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;

        }