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

Commit 0d2abb55 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Support optional modem restart on certain errors. 

Error counts are shared between all APNs, but fresh connect attempt
resets the counts.

bug:22455853
Change-Id: Id398a223d33d42f979b5cdc4a2bc263e92eb73cc
parent 73159fe8

src/java/com/android/internal/telephony/dataconnection/ApnContext.java

+63 −0
Original line number Diff line number Diff line
@@ -18,10 +18,12 @@ package com.android.internal.telephony.dataconnection; 


import android.app.PendingIntent;

import android.content.Context;

import android.content.res.Resources;

import android.net.NetworkConfig;

import android.telephony.Rlog;

import android.text.TextUtils;

import android.util.LocalLog;

import android.util.SparseIntArray;



import com.android.internal.R;

import com.android.internal.telephony.DctConstants;
@@ -320,6 +322,67 @@ public class ApnContext { 
        }

    }



    private final SparseIntArray mRetriesLeftPerErrorCode = new SparseIntArray();



    public void resetErrorCodeRetries() {

        requestLog("ApnContext.resetErrorCodeRetries");

        if (DBG) log("ApnContext.resetErrorCodeRetries");



        String[] config = Resources.getSystem().getStringArray(

                com.android.internal.R.array.config_cell_retries_per_error_code);

        synchronized (mRetriesLeftPerErrorCode) {

            mRetriesLeftPerErrorCode.clear();



            for (String c : config) {

                String errorValue[] = c.split(",");

                if (errorValue != null && errorValue.length == 2) {

                    int count = 0;

                    int errorCode = 0;

                    try {

                        errorCode = Integer.parseInt(errorValue[0]);

                        count = Integer.parseInt(errorValue[1]);

                    } catch (NumberFormatException e) {

                        log("Exception parsing config_retries_per_error_code: " + e);

                        continue;

                    }

                    if (count > 0 && errorCode > 0) {

                        mRetriesLeftPerErrorCode.put(errorCode, count);

                    }

                } else {

                    log("Exception parsing config_retries_per_error_code: " + c);

                }

            }

        }

    }



    public boolean restartOnError(int errorCode) {

        boolean result = false;

        int retriesLeft = 0;

        synchronized(mRetriesLeftPerErrorCode) {

            retriesLeft = mRetriesLeftPerErrorCode.get(errorCode);

            switch (retriesLeft) {

                case 0: {

                    // not set, never restart modem

                    break;

                }

                case 1: {

                    resetErrorCodeRetries();

                    result = true;

                    break;

                }

                default: {

                    mRetriesLeftPerErrorCode.put(errorCode, retriesLeft - 1);

                    result = false;

                }

            }

        }

        String str = "ApnContext.restartOnError(" + errorCode + ") found " + retriesLeft +

                " and returned " + result;

        if (DBG) log(str);

        requestLog(str);

        return result;

    }



    @Override

    public synchronized String toString() {

        // We don't print mDataConnection because its recursive.

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+4 −1
Original line number Diff line number Diff line
@@ -1651,7 +1651,10 @@ public final class DataConnection extends StateMachine { 
                                    mDct.isPermanentFail(result.mFailCause);

                            if (DBG) log(str);

                            if (cp.mApnContext != null) cp.mApnContext.requestLog(str);

                            if (result.mFailCause.isRestartRadioFail()) {

                            if (result.mFailCause.isRestartRadioFail() ||

                                    (cp.mApnContext != null &&

                                    cp.mApnContext.restartOnError(

                                    result.mFailCause.getErrorCode()))) {

                                if (DBG) log("DcActivatingState: ERR_RilError restart radio");

                                mDct.sendRestartRadio();

                                mInactiveState.setEnterNotificationParams(cp, result.mFailCause);

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+4 −1
Original line number Diff line number Diff line
@@ -1599,7 +1599,10 @@ public final class DcTracker extends DcTrackerBase { 
        apnContext.setEnabled(enabled);

        apnContext.setDependencyMet(met);

        if (cleanup) cleanUpConnection(true, apnContext);

        if (trySetup) trySetupData(apnContext);

        if (trySetup) {

            apnContext.resetErrorCodeRetries();

            trySetupData(apnContext);

        }

    }



    private DcAsyncChannel checkForCompatibleConnectedApnContext(ApnContext apnContext) {