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

Commit 2498d822 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge changes I81fcee3c,Ib149939d,I18957758 am: 5a14644d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2469122



Change-Id: I6991fed75dfdbdfb3b76378a7ef88f338c020e1f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5601ccb8 5a14644d

src/java/com/android/internal/telephony/data/PhoneSwitcher.java

+10 −5
Original line number Diff line number Diff line
@@ -406,7 +406,9 @@ public class PhoneSwitcher extends Handler { 
        @Override

        public void onLost(Network network) {

            // try find an active sub to switch to

            scheduleAutoSwitchEvaluation();

            if (!hasMessages(EVENT_EVALUATE_AUTO_SWITCH)) {

                sendEmptyMessage(EVENT_EVALUATE_AUTO_SWITCH);

            }

        }

    }
@@ -1100,7 +1102,9 @@ public class PhoneSwitcher extends Handler { 
                mPhoneStates[phoneId].dataRegState = newRegState;

                logl("onServiceStateChanged:phoneId:" + phoneId + " dataReg-> "

                        + NetworkRegistrationInfo.registrationStateToString(newRegState));

                evaluateIfAutoSwitchIsNeeded();

                if (!hasMessages(EVENT_EVALUATE_AUTO_SWITCH)) {

                    sendEmptyMessage(EVENT_EVALUATE_AUTO_SWITCH);

                }

            }

        }

    }
@@ -1111,6 +1115,7 @@ public class PhoneSwitcher extends Handler { 
    private void evaluateIfAutoSwitchIsNeeded() {

        // auto data switch feature is disabled from server

        if (mAutoDataSwitchAvailabilityStabilityTimeThreshold < 0) return;

        // check is valid DSDS

        if (!mSubscriptionController.isActiveSubId(mPrimaryDataSubId)

                || mSubscriptionController.getActiveSubIdList(true).length <= 1) {

            return;
@@ -1722,7 +1727,7 @@ public class PhoneSwitcher extends Handler { 
     */

    private void validate(int subId, boolean needValidation, int switchReason,

            @Nullable ISetOpportunisticDataCallback callback) {

        logl("Validate " + subId + " due to " + switchReasonToString(switchReason)

        logl("Validate subId " + subId + " due to " + switchReasonToString(switchReason)

                + " needValidation=" + needValidation);

        int subIdToValidate = (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID)

                ? mPrimaryDataSubId : subId;
@@ -1831,7 +1836,7 @@ public class PhoneSwitcher extends Handler { 


            // retry for auto data switch validation failure

            if (mLastAutoSelectedSwitchReason == DataSwitch.Reason.DATA_SWITCH_REASON_AUTO) {

                scheduleAutoSwitchEvaluation();

                scheduleAutoSwitchRetryEvaluation();

                mAutoSwitchRetryFailedCount++;

            }

        } else {
@@ -1853,7 +1858,7 @@ public class PhoneSwitcher extends Handler { 
    /**

     * Schedule auto data switch evaluation retry if haven't reached the max retry count.

     */

    private void scheduleAutoSwitchEvaluation() {

    private void scheduleAutoSwitchRetryEvaluation() {

        if (mAutoSwitchRetryFailedCount < mAutoDataSwitchValidationMaxRetry) {

            if (!hasMessages(EVENT_EVALUATE_AUTO_SWITCH)) {

                sendMessageDelayed(obtainMessage(EVENT_EVALUATE_AUTO_SWITCH),