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

Commit 2326bc47 authored by junyulai's avatar junyulai
Browse files

[VCN19] Rename get/setSubIds to get/setSubscriptionIds 

Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215036
Ignore-AOSP-First: avoid merge conflict
Change-Id: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7
parent f3779061

packages/Connectivity/framework/api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ package android.net { 
    method @NonNull public int[] getAdministratorUids();

    method @Nullable public static String getCapabilityCarrierName(int);

    method @Nullable public String getSsid();

    method @NonNull public java.util.Set<java.lang.Integer> getSubIds();

    method @NonNull public java.util.Set<java.lang.Integer> getSubscriptionIds();

    method @NonNull public int[] getTransportTypes();

    method public boolean isPrivateDnsBroken();

    method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);
@@ -307,7 +307,7 @@ package android.net { 
    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setRequestorUid(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkCapabilities.Builder setSignalStrength(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setSsid(@Nullable String);

    method @NonNull public android.net.NetworkCapabilities.Builder setSubIds(@NonNull java.util.Set<java.lang.Integer>);

    method @NonNull public android.net.NetworkCapabilities.Builder setSubscriptionIds(@NonNull java.util.Set<java.lang.Integer>);

    method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo);

  }
@@ -337,7 +337,7 @@ package android.net { 


  public static class NetworkRequest.Builder {

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkRequest.Builder setSignalStrength(int);

    method @NonNull public android.net.NetworkRequest.Builder setSubIds(@NonNull java.util.Set<java.lang.Integer>);

    method @NonNull public android.net.NetworkRequest.Builder setSubscriptionIds(@NonNull java.util.Set<java.lang.Integer>);

  }



  public final class NetworkScore implements android.os.Parcelable {

packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

+10 −10
Original line number Diff line number Diff line
@@ -1749,7 +1749,7 @@ public final class NetworkCapabilities implements Parcelable { 
        combineSSIDs(nc);

        combineRequestor(nc);

        combineAdministratorUids(nc);

        combineSubIds(nc);

        combineSubscriptionIds(nc);

    }



    /**
@@ -1771,7 +1771,7 @@ public final class NetworkCapabilities implements Parcelable { 
                && (onlyImmutable || satisfiedByUids(nc))

                && (onlyImmutable || satisfiedBySSID(nc))

                && (onlyImmutable || satisfiedByRequestor(nc))

                && (onlyImmutable || satisfiedBySubIds(nc)));

                && (onlyImmutable || satisfiedBySubscriptionIds(nc)));

    }



    /**
@@ -1868,7 +1868,7 @@ public final class NetworkCapabilities implements Parcelable { 
                && equalsPrivateDnsBroken(that)

                && equalsRequestor(that)

                && equalsAdministratorUids(that)

                && equalsSubIds(that);

                && equalsSubscriptionIds(that);

    }



    @Override
@@ -2346,7 +2346,7 @@ public final class NetworkCapabilities implements Parcelable { 
     * @hide

     */

    @NonNull

    public NetworkCapabilities setSubIds(@NonNull Set<Integer> subIds) {

    public NetworkCapabilities setSubscriptionIds(@NonNull Set<Integer> subIds) {

        mSubIds = new ArraySet(Objects.requireNonNull(subIds));

        return this;

    }
@@ -2362,14 +2362,14 @@ public final class NetworkCapabilities implements Parcelable { 
     */

    @NonNull

    @SystemApi

    public Set<Integer> getSubIds() {

    public Set<Integer> getSubscriptionIds() {

        return new ArraySet<>(mSubIds);

    }



    /**

     * Tests if the subscription ID set of this network is the same as that of the passed one.

     */

    private boolean equalsSubIds(@NonNull NetworkCapabilities nc) {

    private boolean equalsSubscriptionIds(@NonNull NetworkCapabilities nc) {

        return Objects.equals(mSubIds, nc.mSubIds);

    }
@@ -2378,7 +2378,7 @@ public final class NetworkCapabilities implements Parcelable { 
     * If specified in the request, the passed one need to have at least one subId and at least

     * one of them needs to be in the request set.

     */

    private boolean satisfiedBySubIds(@NonNull NetworkCapabilities nc) {

    private boolean satisfiedBySubscriptionIds(@NonNull NetworkCapabilities nc) {

        if (mSubIds.isEmpty()) return true;

        if (nc.mSubIds.isEmpty()) return false;

        for (final Integer subId : nc.mSubIds) {
@@ -2395,7 +2395,7 @@ public final class NetworkCapabilities implements Parcelable { 
     * <p>If both subscription IDs are not equal, they belong to different subscription

     * (or no subscription). In this case, it would not make sense to add them together.

     */

    private void combineSubIds(@NonNull NetworkCapabilities nc) {

    private void combineSubscriptionIds(@NonNull NetworkCapabilities nc) {

        if (!Objects.equals(mSubIds, nc.mSubIds)) {

            throw new IllegalStateException("Can't combine two subscription ID sets");

        }
@@ -2737,8 +2737,8 @@ public final class NetworkCapabilities implements Parcelable { 
         */

        @NonNull

        @SystemApi

        public Builder setSubIds(@NonNull final Set<Integer> subIds) {

            mCaps.setSubIds(subIds);

        public Builder setSubscriptionIds(@NonNull final Set<Integer> subIds) {

            mCaps.setSubscriptionIds(subIds);

            return this;

        }

packages/Connectivity/framework/src/android/net/NetworkRequest.java

+2 −2
Original line number Diff line number Diff line
@@ -508,8 +508,8 @@ public class NetworkRequest implements Parcelable { 
         */

        @NonNull

        @SystemApi

        public Builder setSubIds(@NonNull Set<Integer> subIds) {

            mNetworkCapabilities.setSubIds(subIds);

        public Builder setSubscriptionIds(@NonNull Set<Integer> subIds) {

            mNetworkCapabilities.setSubscriptionIds(subIds);

            return this;

        }

    }

services/core/java/com/android/server/ConnectivityService.java

+2 −2
Original line number Diff line number Diff line
@@ -1924,7 +1924,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        newNc.setAdministratorUids(new int[0]);

        if (!checkAnyPermissionOf(

                callerPid, callerUid, android.Manifest.permission.NETWORK_FACTORY)) {

            newNc.setSubIds(Collections.emptySet());

            newNc.setSubscriptionIds(Collections.emptySet());

        }



        return newNc;
@@ -5721,7 +5721,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }

        mAppOpsManager.checkPackage(callerUid, callerPackageName);



        if (!nc.getSubIds().isEmpty()) {

        if (!nc.getSubscriptionIds().isEmpty()) {

            enforceNetworkFactoryPermission();

        }

    }

services/core/java/com/android/server/VcnManagementService.java

+3 −3
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ public class VcnManagementService extends IVcnManagementService.Stub { 


        // If multiple subscription IDs exist, they MUST all point to the same subscription

        // group. Otherwise undefined behavior may occur.

        for (int subId : networkCapabilities.getSubIds()) {

        for (int subId : networkCapabilities.getSubscriptionIds()) {

            // Verify that all subscriptions point to the same group

            if (subGrp != null && !subGrp.equals(snapshot.getGroupForSubId(subId))) {

                Slog.wtf(TAG, "Got multiple subscription groups for a single network");
@@ -1003,14 +1003,14 @@ public class VcnManagementService extends IVcnManagementService.Stub { 
        }



        private boolean requiresRestartForCarrierWifi(NetworkCapabilities caps) {

            if (!caps.hasTransport(TRANSPORT_WIFI) || caps.getSubIds() == null) {

            if (!caps.hasTransport(TRANSPORT_WIFI) || caps.getSubscriptionIds() == null) {

                return false;

            }



            synchronized (mCaps) {

                for (NetworkCapabilities existing : mCaps.values()) {

                    if (existing.hasTransport(TRANSPORT_WIFI)

                            && caps.getSubIds().equals(existing.getSubIds())) {

                            && caps.getSubscriptionIds().equals(existing.getSubscriptionIds())) {

                        // Restart if any immutable capabilities have changed

                        return existing.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)

                                != caps.hasCapability(NET_CAPABILITY_NOT_RESTRICTED);