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

Commit 9f594083 authored by Shuo Qian's avatar Shuo Qian Committed by sqian
Browse files

Use public NetworkRequest#getNetworkSpecifier() for Mainline 

We need to use public NetworkRequest#getNetworkSpecifier() instead
 of using nr.networkCapabilities.getNetworkSpecifier()

Test: Treehugger; no function changes
Bug: 147017757
Change-Id: Ifd11b5c65b601554f3a6296d87382137db0b11b5
parent a9cadb25

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

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



    private int phoneIdForRequest(NetworkRequest netRequest) {

        int subId = getSubIdFromNetworkSpecifier(netRequest.networkCapabilities

                .getNetworkSpecifier());

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



        if (subId == DEFAULT_SUBSCRIPTION_ID) return mPreferredDataPhoneId;

        if (subId == INVALID_SUBSCRIPTION_ID) return INVALID_PHONE_INDEX;

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

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

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

                if (networkRequest.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

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

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

                    score = DEFAULT_INTERNET_CONNECTION_SCORE;

                    break;

                }