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

Commit fcb18ca6 authored by Yashdev Singh's avatar Yashdev Singh Committed by Linux Build Service Account
Browse files

Telephony: Dont detach on-demand subscription during DDS switch to on-demand subscription. 

- DDS switch leads to PS DETACH on current subscription. The current
subscription could be the on-demand PS attached subscription.
- Do not detach while getting out of PsAttachReservedState if current subscription
is the default DDS sub.

Change-Id: I86fa922acbd955e43786763681b1177b2421a29e
parent 5383ecec

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

+31 −15
Original line number Diff line number Diff line
@@ -507,23 +507,28 @@ public class DctController extends Handler { 
            dcTracker.cleanUpAllConnections("DDS switch");

        }

    }

    public void setDefaultDataSubId(long subId) {

        int phoneId = mSubController.getPhoneId(subId);

        SwitchInfo s = new SwitchInfo(new Integer(phoneId), true);

        int prefPhoneId = mSubController.getPhoneId(mSubController.getCurrentDds());

        if (prefPhoneId < 0 || prefPhoneId >= mPhoneNum) {

    public void setDefaultDataSubId(long reqSubId) {

        int reqPhoneId = mSubController.getPhoneId(reqSubId);

        long currentDds = mSubController.getCurrentDds();

        long defaultDds = mSubController.getDefaultDataSubId();

        SwitchInfo s = new SwitchInfo(new Integer(reqPhoneId), true);

        int currentDdsPhoneId = mSubController.getPhoneId(currentDds);

        if (currentDdsPhoneId < 0 || currentDdsPhoneId >= mPhoneNum) {

            // If Current dds subId is invalid set the received subId as current DDS

            // This generally happens when device power-up first time.

            logd(" setDefaultDataSubId,  subId = " + subId + " phoneId  " + prefPhoneId);

            logd(" setDefaultDataSubId,  reqSubId = " + reqSubId + " currentDdsPhoneId  "

                    + currentDdsPhoneId);

            Settings.Global.putLong(mContext.getContentResolver(),

                    Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION, subId);

                    Settings.Global.MULTI_SIM_DATA_CALL_SUBSCRIPTION, reqSubId);

            defaultDds = reqSubId;

            currentDdsPhoneId = mSubController.getPhoneId(defaultDds);

        }

        Rlog.d(LOG_TAG, "setDefaultDataSubId subId :" + subId + " phoneId = " + phoneId);

        Rlog.d(LOG_TAG, "setDefaultDataSubId reqSubId :" + reqSubId + " reqPhoneId = "

                + reqPhoneId);



        // Check for phoneId and prefPhoneId here, to avoid sending

        //  data allow false and true on same sub.

        if ((subId != mSubController.getDefaultDataSubId()) && (phoneId != prefPhoneId)) {

            doDetach(prefPhoneId);

        // Avoid sending data allow false and true on same sub .

        if ((reqSubId != defaultDds) && (reqPhoneId != currentDdsPhoneId)) {

            doDetach(currentDdsPhoneId);

        } else {

            logd("setDefaultDataSubId for default DDS, skip PS detach on DDS subs");

            sendMessage(obtainMessage(EVENT_LEGACY_SET_DATA_SUBSCRIPTION,
@@ -531,7 +536,7 @@ public class DctController extends Handler { 
            return;

        }



        mPhones[prefPhoneId].registerForAllDataDisconnected(

        mPhones[currentDdsPhoneId].registerForAllDataDisconnected(

                this, EVENT_ALL_DATA_DISCONNECTED, s);

    }
@@ -568,8 +573,19 @@ public class DctController extends Handler { 
        dcTracker.setDataAllowed(true, psAttachDone);

    }



    public void doPsDetach(NetworkRequest n) {

        Rlog.d(LOG_TAG, "doPsDetach for sub:" + mSubController.getCurrentDds());

    /**

     * This is public API and client might call doPsDetach on DDS sub.

     * Ignore if thats the case.

     */

    public void doPsDetach() {

        long currentDds = mSubController.getCurrentDds();

        long defaultDds = mSubController.getDefaultDataSubId();



        if (currentDds == defaultDds) {

            Rlog.d(LOG_TAG, "PS DETACH on DDS sub is not allowed.");

            return;

        }

        Rlog.d(LOG_TAG, "doPsDetach for sub:" + currentDds);



        int phoneId = mSubController.getPhoneId(

                mSubController.getCurrentDds());

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

+3 −3
Original line number Diff line number Diff line
@@ -228,8 +228,8 @@ public class DdsScheduler extends StateMachine { 
        mDctController.doPsAttach(n);

    }



    private void requestPsDetach(NetworkRequest n) {

        mDctController.doPsDetach(n);

    private void requestPsDetach() {

        mDctController.doPsDetach();

    }



    private int getMaxDataAllowed() {
@@ -468,7 +468,7 @@ public class DdsScheduler extends StateMachine { 
            Rlog.d(TAG, "Exit");



            //Request PS Detach on currentDds.

            requestPsDetach(null);

            requestPsDetach();

            //Update currentDds back to defaultDataSub.

            updateCurrentDds(null);

        }