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

Commit d83e01cb authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Rename non-opportunistic (nonOppt) to primary. 

Bug: 123598154
Test: build
Change-Id: I878b7516516358dcf16bde42a555c34e8ab879e4
parent 5698b715

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

+20 −20
Original line number Diff line number Diff line
@@ -105,12 +105,12 @@ public class PhoneSwitcher extends Handler { 
    private int mMaxActivePhones;

    private static PhoneSwitcher sPhoneSwitcher = null;



    // Which non-opportunistic subscription is set as data subscription among all non-oppt

    // Which primary (non-opportunistic) subscription is set as data subscription among all primary

    // subscriptions. This value usually comes from user setting, and it's the subscription used for

    // Internet data if mOpptDataSubId is not set.

    private int mNonOpptDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    private int mPrimaryDataSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;



    // mOpptDataSubId must be an active subscription. If it's set, it overrides mNonOpptDataSubId

    // mOpptDataSubId must be an active subscription. If it's set, it overrides mPrimaryDataSubId

    // to be used for Internet data.

    private int mOpptDataSubId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;
@@ -123,7 +123,7 @@ public class PhoneSwitcher extends Handler { 
    // 1. In modem layer, which modem is DDS (preferred to have data traffic on)

    // 2. In TelephonyNetworkFactory, which subscription will apply default network requests, which

    //    are requests without specifying a subId.

    // Corresponding phoneId after considering mOpptDataSubId, mNonOpptDataSubId and

    // Corresponding phoneId after considering mOpptDataSubId, mPrimaryDataSubId and

    // mPhoneIdInVoiceCall above.

    protected int mPreferredDataPhoneId = SubscriptionManager.INVALID_PHONE_INDEX;
@@ -132,13 +132,13 @@ public class PhoneSwitcher extends Handler { 


    private ISetOpportunisticDataCallback mSetOpptSubCallback;



    private static final int EVENT_NON_OPPT_SUBSCRIPTION_CHANGED  = 101;

    private static final int EVENT_PRIMARY_DATA_SUB_CHANGED       = 101;

    private static final int EVENT_SUBSCRIPTION_CHANGED           = 102;

    private static final int EVENT_REQUEST_NETWORK                = 103;

    private static final int EVENT_RELEASE_NETWORK                = 104;

    private static final int EVENT_EMERGENCY_TOGGLE               = 105;

    private static final int EVENT_RADIO_CAPABILITY_CHANGED       = 106;

    private static final int EVENT_OPPT_SUBSCRIPTION_CHANGED      = 107;

    private static final int EVENT_OPPT_DATA_SUB_CHANGED          = 107;

    private static final int EVENT_RADIO_AVAILABLE                = 108;

    private static final int EVENT_PHONE_IN_CALL_CHANGED          = 109;

    private static final int EVENT_NETWORK_VALIDATION_DONE        = 110;
@@ -326,7 +326,7 @@ public class PhoneSwitcher extends Handler { 
    private final BroadcastReceiver mDefaultDataChangedReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            Message msg = PhoneSwitcher.this.obtainMessage(EVENT_NON_OPPT_SUBSCRIPTION_CHANGED);

            Message msg = PhoneSwitcher.this.obtainMessage(EVENT_PRIMARY_DATA_SUB_CHANGED);

            msg.sendToTarget();

        }

    };
@@ -347,8 +347,8 @@ public class PhoneSwitcher extends Handler { 
                onEvaluate(REQUESTS_UNCHANGED, "subChanged");

                break;

            }

            case EVENT_NON_OPPT_SUBSCRIPTION_CHANGED: {

                if (onEvaluate(REQUESTS_UNCHANGED, "non-oppt data subId changed")) {

            case EVENT_PRIMARY_DATA_SUB_CHANGED: {

                if (onEvaluate(REQUESTS_UNCHANGED, "primary data subId changed")) {

                    logDataSwitchEvent(mOpptDataSubId,

                            TelephonyEvent.EventState.EVENT_STATE_START,

                            DataSwitch.Reason.DATA_SWITCH_REASON_MANUAL);
@@ -372,7 +372,7 @@ public class PhoneSwitcher extends Handler { 
                resendRilCommands(msg);

                break;

            }

            case EVENT_OPPT_SUBSCRIPTION_CHANGED: {

            case EVENT_OPPT_DATA_SUB_CHANGED: {

                int subId = msg.arg1;

                boolean needValidation = (msg.arg2 == 1);

                ISetOpportunisticDataCallback callback =
@@ -531,11 +531,11 @@ public class PhoneSwitcher extends Handler { 
        boolean diffDetected = mHalCommandToUse != HAL_COMMAND_PREFERRED_DATA && requestsChanged;



        // Check if user setting of default non-opportunistic data sub is changed.

        final int nonOpptDataSubId = mSubscriptionController.getDefaultDataSubId();

        if (nonOpptDataSubId != mNonOpptDataSubId) {

            sb.append(" mNonOpptDataSubId ").append(mNonOpptDataSubId).append("->")

                .append(nonOpptDataSubId);

            mNonOpptDataSubId = nonOpptDataSubId;

        final int primaryDataSubId = mSubscriptionController.getDefaultDataSubId();

        if (primaryDataSubId != mPrimaryDataSubId) {

            sb.append(" mPrimaryDataSubId ").append(mPrimaryDataSubId).append("->")

                .append(primaryDataSubId);

            mPrimaryDataSubId = primaryDataSubId;

        }



        // Check if phoneId to subId mapping is changed.
@@ -598,7 +598,7 @@ public class PhoneSwitcher extends Handler { 
                }



                if (VDBG) {

                    log("mNonOpptDataSubId = " + mNonOpptDataSubId);

                    log("mPrimaryDataSubId = " + mPrimaryDataSubId);

                    log("mOpptDataSubId = " + mOpptDataSubId);

                    for (int i = 0; i < mNumPhones; i++) {

                        log(" phone[" + i + "] using sub[" + mPhoneSubscriptions[i] + "]");
@@ -746,7 +746,7 @@ public class PhoneSwitcher extends Handler { 
        if (mSubscriptionController.isActiveSubId(mOpptDataSubId)) {

            return mOpptDataSubId;

        } else {

            return mNonOpptDataSubId;

            return mPrimaryDataSubId;

        }

    }
@@ -863,7 +863,7 @@ public class PhoneSwitcher extends Handler { 
        }



        // Set mOpptDataSubId back to DEFAULT_SUBSCRIPTION_ID. This will trigger

        // data switch to mNonOpptDataSubId.

        // data switch to mPrimaryDataSubId.

        setOpportunisticSubscriptionInternal(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);

        sendSetOpptCallbackHelper(callback, SET_OPPORTUNISTIC_SUB_SUCCESS);

    }
@@ -910,7 +910,7 @@ public class PhoneSwitcher extends Handler { 
            ISetOpportunisticDataCallback callback) {

        log("Try set opportunistic data subscription to subId " + subId

                + (needValidation ? " with " : " without ") + "validation");

        PhoneSwitcher.this.obtainMessage(EVENT_OPPT_SUBSCRIPTION_CHANGED,

        PhoneSwitcher.this.obtainMessage(EVENT_OPPT_DATA_SUB_CHANGED,

                subId, needValidation ? 1 : 0, callback).sendToTarget();

    }
@@ -943,7 +943,7 @@ public class PhoneSwitcher extends Handler { 
    }



    private void logDataSwitchEvent(int subId, int state, int reason) {

        subId = subId == DEFAULT_SUBSCRIPTION_ID ? mNonOpptDataSubId : subId;

        subId = subId == DEFAULT_SUBSCRIPTION_ID ? mPrimaryDataSubId : subId;

        DataSwitch dataSwitch = new DataSwitch();

        dataSwitch.state = state;

        dataSwitch.reason = reason;