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

Commit fa42710c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use public NetworkRequest#getNetworkSpecifier() for Mainline" am: c56a7070 am: 0cbc640d 

Change-Id: I1a1d914f832426cd58f5458a232f4de35d396c03
parents 4e84beb6 0cbc640d

src/java/com/android/internal/telephony/PhoneSwitcher.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -962,8 +962,7 @@ public class PhoneSwitcher extends Handler { 
    }

    }





    private int phoneIdForRequest(NetworkRequest netRequest) {

    private int phoneIdForRequest(NetworkRequest netRequest) {

        int subId = getSubIdFromNetworkSpecifier(netRequest.networkCapabilities

        int subId = getSubIdFromNetworkSpecifier(netRequest.getNetworkSpecifier());

                .getNetworkSpecifier());





        if (subId == DEFAULT_SUBSCRIPTION_ID) return mPreferredDataPhoneId;

        if (subId == DEFAULT_SUBSCRIPTION_ID) return mPreferredDataPhoneId;

        if (subId == INVALID_SUBSCRIPTION_ID) return INVALID_PHONE_INDEX;

        if (subId == INVALID_SUBSCRIPTION_ID) return INVALID_PHONE_INDEX;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2919,7 +2919,7 @@ public class DataConnection extends StateMachine { 
        for (ApnContext apnContext : mApnContexts.keySet()) {

        for (ApnContext apnContext : mApnContexts.keySet()) {

            for (NetworkRequest networkRequest : apnContext.getNetworkRequests()) {

            for (NetworkRequest networkRequest : apnContext.getNetworkRequests()) {

                if (networkRequest.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                if (networkRequest.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                        && networkRequest.networkCapabilities.getNetworkSpecifier() == null) {

                        && networkRequest.getNetworkSpecifier() == null) {

                    score = DEFAULT_INTERNET_CONNECTION_SCORE;

                    score = DEFAULT_INTERNET_CONNECTION_SCORE;

                    break;

                    break;

                }

                }