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

Commit 223bd993 authored by Jack Yu's avatar Jack Yu
Browse files

Cleaned up dead code 

Cleaned up dead code and simplified code path.

Test: Telephony sanity tests + unit tests
Bug: 73659459
Change-Id: I3337dc67174a483ba2110774a0175a008a7bede0
parent a333194d

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

+11 −28
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ public class DcTracker extends Handler { 
        if (mAutoAttachOnCreationConfig) {

            mAutoAttachOnCreation.set(true);

        }

        setupDataOnConnectableApns(Phone.REASON_DATA_ATTACHED);

        setupDataOnConnectableApns(Phone.REASON_DATA_ATTACHED, RetryFailures.ALWAYS);

    }



    /**
@@ -1287,10 +1287,6 @@ public class DcTracker extends Handler { 
        ONLY_ON_CHANGE

    };



    private void setupDataOnConnectableApns(String reason) {

        setupDataOnConnectableApns(reason, RetryFailures.ALWAYS);

    }



    private void setupDataOnConnectableApns(String reason, RetryFailures retryFailures) {

        if (VDBG) log("setupDataOnConnectableApns: " + reason);
@@ -1947,7 +1943,7 @@ public class DcTracker extends Handler { 


        // FIXME: See bug 17426028 maybe no conditional is needed.

        if (mPhone.getSubId() == SubscriptionManager.getDefaultDataSubscriptionId()) {

            setupDataOnConnectableApns(Phone.REASON_APN_CHANGED);

            setupDataOnConnectableApns(Phone.REASON_APN_CHANGED, RetryFailures.ALWAYS);

        }

    }
@@ -2102,7 +2098,7 @@ public class DcTracker extends Handler { 
            if (DBG) log("onRecordsLoadedOrSubIdChanged: notifying data availability");

            notifyOffApnsOfAvailability();

        }

        setupDataOnConnectableApns(Phone.REASON_SIM_LOADED);

        setupDataOnConnectableApns(Phone.REASON_SIM_LOADED, RetryFailures.ALWAYS);

    }



    private void onSimNotReady() {
@@ -2296,22 +2292,10 @@ public class DcTracker extends Handler { 
            if(DBG) log("onEnableApn: isOnlySingleDcAllowed true & higher priority APN disabled");

            // If the highest priority APN is disabled and only single

            // data call is allowed, try to setup data call on other connectable APN.

            setupDataOnConnectableApns(Phone.REASON_SINGLE_PDN_ARBITRATION);

            setupDataOnConnectableApns(Phone.REASON_SINGLE_PDN_ARBITRATION, RetryFailures.ALWAYS);

        }

    }



    // TODO: We shouldnt need this.

    private boolean onTrySetupData(String reason) {

        if (DBG) log("onTrySetupData: reason=" + reason);

        setupDataOnConnectableApns(reason);

        return true;

    }



    private boolean onTrySetupData(ApnContext apnContext) {

        if (DBG) log("onTrySetupData: apnContext=" + apnContext);

        return trySetupData(apnContext);

    }



    /**

     * Modify {@link android.provider.Settings.Global#DATA_ROAMING} value for user modification only

     */
@@ -2450,7 +2434,7 @@ public class DcTracker extends Handler { 
            // non-roaming, we should try to reestablish the data connection.



            notifyOffApnsOfAvailability();

            setupDataOnConnectableApns(Phone.REASON_ROAMING_OFF);

            setupDataOnConnectableApns(Phone.REASON_ROAMING_OFF, RetryFailures.ALWAYS);

        } else {

            notifyDataConnection();

        }
@@ -2482,7 +2466,7 @@ public class DcTracker extends Handler { 


            if (DBG) log("onDataRoamingOnOrSettingsChanged: setup data on roaming");



            setupDataOnConnectableApns(Phone.REASON_ROAMING_ON);

            setupDataOnConnectableApns(Phone.REASON_ROAMING_ON, RetryFailures.ALWAYS);

            notifyDataConnection();

        } else {

            // If the user does not turn on data roaming, when we transit from non-roaming to
@@ -2903,7 +2887,8 @@ public class DcTracker extends Handler { 
            apnContext.setDataConnection(null);

            if (isOnlySingleDcAllowed(mPhone.getServiceState().getRilDataRadioTechnology())) {

                if(DBG) log("onDisconnectDone: isOnlySigneDcAllowed true so setup single apn");

                setupDataOnConnectableApns(Phone.REASON_SINGLE_PDN_ARBITRATION);

                setupDataOnConnectableApns(Phone.REASON_SINGLE_PDN_ARBITRATION,

                        RetryFailures.ALWAYS);

            } else {

                if(DBG) log("onDisconnectDone: not retrying");

            }
@@ -2945,7 +2930,7 @@ public class DcTracker extends Handler { 
            }

        }

        // reset reconnect timer

        setupDataOnConnectableApns(Phone.REASON_VOICE_CALL_ENDED);

        setupDataOnConnectableApns(Phone.REASON_VOICE_CALL_ENDED, RetryFailures.ALWAYS);

    }



    private boolean isConnected() {
@@ -3410,9 +3395,7 @@ public class DcTracker extends Handler { 


            case DctConstants.EVENT_TRY_SETUP_DATA:

                if (msg.obj instanceof ApnContext) {

                    onTrySetupData((ApnContext)msg.obj);

                } else if (msg.obj instanceof String) {

                    onTrySetupData((String)msg.obj);

                    trySetupData((ApnContext) msg.obj);

                } else {

                    loge("EVENT_TRY_SETUP request w/o apnContext or String");

                }
@@ -3752,7 +3735,7 @@ public class DcTracker extends Handler { 


        if (enable) {

            reevaluateDataConnections();

            onTrySetupData(Phone.REASON_DATA_ENABLED);

            setupDataOnConnectableApns(Phone.REASON_DATA_ENABLED, RetryFailures.ALWAYS);

        } else {

            String cleanupReason;

            switch (enabledChangedReason) {