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

Commit d725f63d authored by Rambo Wang's avatar Rambo Wang
Browse files

Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer 

StringNetworkSpecifier is widely used to specify subscription id for
the NetworkRequest. The raw string field introduce ambiguity and leave
large space for bugs. With TelephonyNetworkSpecifer, we are able to
settle down the type and value of the fields (although currently only
one) and introduce validation to detect the bug in the beginning.

Bug: 145993724
Test: atest FrameworksNetTests FrameworksTelephonyTests
Change-Id: Ie4bf089f6a4a2a572add4a78e36710a84e574b01
parent c6a31734

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

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.net.ConnectivityManager; 
import android.net.Network;

import android.net.NetworkCapabilities;

import android.net.NetworkRequest;

import android.net.TelephonyNetworkSpecifier;

import android.os.Handler;

import android.telephony.SubscriptionManager;

import android.util.Log;
@@ -193,7 +194,8 @@ public class CellularNetworkValidator { 
        return new NetworkRequest.Builder()

                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)

                .setNetworkSpecifier(String.valueOf(mSubId))

                .setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()

                        .setSubscriptionId(mSubId).build())

                .build();

    }

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

+4 −16
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import android.net.NetworkCapabilities; 
import android.net.NetworkFactory;

import android.net.NetworkRequest;

import android.net.NetworkSpecifier;

import android.net.StringNetworkSpecifier;

import android.net.TelephonyNetworkSpecifier;

import android.os.AsyncResult;

import android.os.Handler;

import android.os.Looper;
@@ -999,24 +999,12 @@ public class PhoneSwitcher extends Handler { 
        if (specifier == null) {

            return DEFAULT_SUBSCRIPTION_ID;

        }



        int subId;



        if (specifier instanceof StringNetworkSpecifier) {

            try {

                subId = Integer.parseInt(((StringNetworkSpecifier) specifier).specifier);

            } catch (NumberFormatException e) {

                Rlog.e(LOG_TAG, "NumberFormatException on "

                        + ((StringNetworkSpecifier) specifier).specifier);

                return INVALID_SUBSCRIPTION_ID;

        if (specifier instanceof TelephonyNetworkSpecifier) {

            return ((TelephonyNetworkSpecifier) specifier).getSubscriptionId();

        }

        } else {

        return INVALID_SUBSCRIPTION_ID;

    }



        return subId;

    }



    private int getSubIdForDefaultNetworkRequests() {

        if (mSubscriptionController.isActiveSubId(mOpptDataSubId)) {

            return mOpptDataSubId;

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

+3 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import android.net.NetworkRequest; 
import android.net.ProxyInfo;

import android.net.RouteInfo;

import android.net.SocketKeepalive;

import android.net.StringNetworkSpecifier;

import android.net.TelephonyNetworkSpecifier;

import android.os.AsyncResult;

import android.os.Message;

import android.os.PersistableBundle;
@@ -1331,7 +1331,8 @@ public class DataConnection extends StateMachine { 
        result.setLinkUpstreamBandwidthKbps(up);

        result.setLinkDownstreamBandwidthKbps(down);



        result.setNetworkSpecifier(new StringNetworkSpecifier(Integer.toString(mSubId)));

        result.setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()

                .setSubscriptionId(mSubId).build());



        result.setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING,

                !mPhone.getServiceState().getDataRoaming());

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

+3 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID; 
import android.net.NetworkCapabilities;

import android.net.NetworkFactory;

import android.net.NetworkRequest;

import android.net.StringNetworkSpecifier;

import android.net.TelephonyNetworkSpecifier;

import android.os.AsyncResult;

import android.os.Bundle;

import android.os.Handler;
@@ -145,7 +145,8 @@ public class TelephonyNetworkFactory extends NetworkFactory { 
        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_EIMS);

        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);

        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);

        nc.setNetworkSpecifier(new StringNetworkSpecifier(String.valueOf(subscriptionId)));

        nc.setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()

                .setSubscriptionId(subscriptionId).build());

        return nc;

    }

tests/telephonytests/src/com/android/internal/telephony/CellularNetworkValidatorTest.java

+9 −4
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.verify; 
import android.net.Network;

import android.net.NetworkCapabilities;

import android.net.NetworkRequest;

import android.net.TelephonyNetworkSpecifier;

import android.telephony.PhoneCapability;

import android.telephony.SubscriptionManager;

import android.test.suitebuilder.annotation.SmallTest;
@@ -95,7 +96,8 @@ public class CellularNetworkValidatorTest extends TelephonyTest { 
        NetworkRequest expectedRequest = new NetworkRequest.Builder()

                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)

                .setNetworkSpecifier(String.valueOf(subId))

                .setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()

                        .setSubscriptionId(subId).build())

                .build();



        mValidatorUT.validate(subId, timeout, true, mCallback);
@@ -128,7 +130,8 @@ public class CellularNetworkValidatorTest extends TelephonyTest { 
        NetworkRequest expectedRequest = new NetworkRequest.Builder()

                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)

                .setNetworkSpecifier(String.valueOf(subId))

                .setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()

                        .setSubscriptionId(subId).build())

                .build();



        mValidatorUT.validate(subId, timeout, true, mCallback);
@@ -162,7 +165,8 @@ public class CellularNetworkValidatorTest extends TelephonyTest { 
        NetworkRequest expectedRequest = new NetworkRequest.Builder()

                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)

                .setNetworkSpecifier(String.valueOf(subId))

                .setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()

                        .setSubscriptionId(subId).build())

                .build();



        mValidatorUT.validate(subId, timeout, true, mCallback);
@@ -194,7 +198,8 @@ public class CellularNetworkValidatorTest extends TelephonyTest { 
        NetworkRequest expectedRequest = new NetworkRequest.Builder()

                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)

                .setNetworkSpecifier(String.valueOf(subId))

                .setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()

                        .setSubscriptionId(subId).build())

                .build();



        mValidatorUT.validate(subId, timeout, true, mCallback);