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

Commit 990f5505 authored by Prashant Singh's avatar Prashant Singh Committed by Linux Build Service Account
Browse files

Data Call setup fixes. 

- Auto attach flag is true after the first data attach.
  When there is an on demand MMS request on non-DDS sub,
  MMS PDP setup is attempted even when data is out of service.
  This can be a performance hit as multiple SETUP_DATA_CALL
  requests can be sent down to RIL in OOS. Avoid this by
  considering auto attach flag only on DDS sub.

- Use the subId from current phone to do retry as on demand
  PDP retries will fail otherwise.

Conflicts:
src/java/com/android/internal/telephony/dataconnection/DcTracker.java
Change-Id: Iac7d5a226460ce08957ac10e222c8231a461a7d3
CRs-Fixed: 865004
parent dceb0ff1

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

+4 −3
Original line number Diff line number Diff line
@@ -778,7 +778,8 @@ public class DcTracker extends DcTrackerBase { 
            state = mPhone.getCallTracker().getState();

        }

        boolean allowed =

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

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

                            (mPhone.getSubId() == dataSub))) &&

                    recordsLoaded &&

                    (state == PhoneConstants.State.IDLE ||

                    (subscriptionFromNv || recordsLoaded) &&
@@ -1515,12 +1516,12 @@ public class DcTracker extends DcTrackerBase { 
        intent.putExtra(INTENT_RECONNECT_ALARM_EXTRA_TYPE, apnType);



        // Get current sub id.

        int subId = SubscriptionManager.getDefaultDataSubId();

        int subId = mPhone.getSubId();

        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);



        if (DBG) {

            log("startAlarmForReconnect: delay=" + delay + " action=" + intent.getAction()

                    + " apn=" + apnContext);

                    + " apn=" + apnContext + " subId=" + subId);

        }



        PendingIntent alarmIntent = PendingIntent.getBroadcast (mPhone.getContext(), 0,