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

Commit cc27ffa9 authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak Committed by android-build-merger
Browse files

Merge "Fix data connection issues introduced in a7228870" into mnc-dr-dev 

am: 1c0adee0

* commit '1c0adee0':
  Fix data connection issues introduced in a7228870
parents c9ab3da1 1c0adee0

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

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

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



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

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

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

            // NOTE: executedPhoneId might be reset

        }



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

        mRequestInfos.put(request.requestId, requestInfo);

        processRequests();

        }



        return PhoneConstants.APN_REQUEST_STARTED;

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



        if (requestedPhoneId == INVALID_PHONE_INDEX) {

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

            // 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();

            }

            return;

        }