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

Commit fdd04d44 authored by Bryce Lee's avatar Bryce Lee
Browse files

DO NOT MERGE ANYWHERE 

Revert "Fix data connection issues introduced in a7228870"

This reverts commit 92760e16.

Bug: 25272633
Change-Id: Iac5fdbb77a07f5e128d007b8fdc66b91c23e1454
parent 3f1fba09

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

+5 −13
Original line number Diff line number Diff line
@@ -316,14 +316,11 @@ public class DctController extends Handler { 
        logd("requestNetwork request=" + request + ", priority=" + priority);

        l.log("Dctc.requestNetwork, priority=" + priority);



        if (mRequestInfos.containsKey(request.requestId)) {

            logd("requestNetwork replacing " + mRequestInfos.get(request.requestId));

            // NOTE: executedPhoneId might be reset

        }



        if (mRequestInfos.containsKey(request.requestId) == false) {

            RequestInfo requestInfo = new RequestInfo(request, priority, l);

            mRequestInfos.put(request.requestId, requestInfo);

            processRequests();

        }



        return PhoneConstants.APN_REQUEST_STARTED;

    }
@@ -392,12 +389,7 @@ public class DctController extends Handler { 
                + ", activePhoneId=" + activePhoneId);



        if (requestedPhoneId == INVALID_PHONE_INDEX) {

            // either we have no network request

            // or there is no valid subscription at the moment

            if (activePhoneId != INVALID_PHONE_INDEX) {

                // detatch so we can try connecting later

                mDcSwitchAsyncChannel[activePhoneId].disconnectAll();

            }

            // we have no network request - don't bother with this

            return;

        }