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

Commit 0a4ebc3c authored by Sandeep Gutta's avatar Sandeep Gutta Committed by Linux Build Service Account
Browse files

MSIM: Do not set data attach state to true 

On MSIM devices, data attach value is set to true
always and due to that setUpData call is being triggered
even if device is not in service.

To fix this remove the code that sets attach state to true.

Change-Id: I15b13ef36983e1ea426c78fd5358ae5f85ce3428
parent 0bf8a693

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

+2 −9
Original line number Diff line number Diff line
@@ -757,13 +757,6 @@ public class DcTracker extends DcTrackerBase { 
            if (DBG && !recordsLoaded) log("isDataAllowed getRecordsLoaded=" + recordsLoaded);

        }



        //FIXME always attach

        boolean psRestricted = mIsPsRestricted;

        int phoneNum = TelephonyManager.getDefault().getPhoneCount();

        if (phoneNum > 1) {

            attachedState = true;

            psRestricted = false;

        }

        int dataSub = SubscriptionManager.getDefaultDataSubId();

        boolean defaultDataSelected = SubscriptionManager.isValidSubscriptionId(dataSub);

        PhoneConstants.State state = PhoneConstants.State.IDLE;
@@ -777,6 +770,7 @@ public class DcTracker extends DcTrackerBase { 
        if (mPhone.getCallTracker() != null) {

            state = mPhone.getCallTracker().getState();

        }



        boolean allowed =

                    (attachedState || (mAutoAttachOnCreation.get() &&

                            (mPhone.getSubId() == dataSub))) &&
@@ -787,8 +781,7 @@ public class DcTracker extends DcTrackerBase { 
                    internalDataEnabled &&

                    defaultDataSelected &&

                    (!mPhone.getServiceState().getDataRoaming() || getDataOnRoamingEnabled()) &&

                    //!mIsPsRestricted &&

                    !psRestricted &&

                    !mIsPsRestricted &&

                    desiredPowerState;

        if (!allowed && DBG) {

            String reason = "";