From 3c409e8ce7229bfe6c141ec154d9076edbeba05c Mon Sep 17 00:00:00 2001 From: junyulai Date: Wed, 14 Apr 2021 23:33:31 +0800 Subject: [PATCH] [VCN19] Rename get/setSubIds to get/setSubscriptionIds Test: atest FrameworksNetTests FrameworksVcnTests Fix: 185215036 Merged-In: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7 Change-Id: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7 (cherry-picked from ag/14198665) --- framework/api/system-current.txt | 6 ++-- .../src/android/net/NetworkCapabilities.java | 20 +++++------ framework/src/android/net/NetworkRequest.java | 4 +-- .../android/server/ConnectivityService.java | 4 +-- .../android/net/NetworkCapabilitiesTest.java | 36 +++++++++---------- .../server/ConnectivityServiceTest.java | 10 +++--- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt index de673ee971..935b09330c 100644 --- a/framework/api/system-current.txt +++ b/framework/api/system-current.txt @@ -275,7 +275,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 getSubIds(); + method @NonNull public java.util.Set getSubscriptionIds(); method @NonNull public int[] getTransportTypes(); method public boolean isPrivateDnsBroken(); method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities); @@ -306,7 +306,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); + method @NonNull public android.net.NetworkCapabilities.Builder setSubscriptionIds(@NonNull java.util.Set); method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo); } @@ -329,7 +329,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); + method @NonNull public android.net.NetworkRequest.Builder setSubscriptionIds(@NonNull java.util.Set); } public final class NetworkScore implements android.os.Parcelable { diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java index a43dd15a87..937a9d2393 100644 --- a/framework/src/android/net/NetworkCapabilities.java +++ b/framework/src/android/net/NetworkCapabilities.java @@ -1733,7 +1733,7 @@ public final class NetworkCapabilities implements Parcelable { combineSSIDs(nc); combineRequestor(nc); combineAdministratorUids(nc); - combineSubIds(nc); + combineSubscriptionIds(nc); } /** @@ -1755,7 +1755,7 @@ public final class NetworkCapabilities implements Parcelable { && (onlyImmutable || satisfiedByUids(nc)) && (onlyImmutable || satisfiedBySSID(nc)) && (onlyImmutable || satisfiedByRequestor(nc)) - && (onlyImmutable || satisfiedBySubIds(nc))); + && (onlyImmutable || satisfiedBySubscriptionIds(nc))); } /** @@ -1852,7 +1852,7 @@ public final class NetworkCapabilities implements Parcelable { && equalsPrivateDnsBroken(that) && equalsRequestor(that) && equalsAdministratorUids(that) - && equalsSubIds(that); + && equalsSubscriptionIds(that); } @Override @@ -2329,7 +2329,7 @@ public final class NetworkCapabilities implements Parcelable { * @hide */ @NonNull - public NetworkCapabilities setSubIds(@NonNull Set subIds) { + public NetworkCapabilities setSubscriptionIds(@NonNull Set subIds) { mSubIds = new ArraySet(Objects.requireNonNull(subIds)); return this; } @@ -2345,14 +2345,14 @@ public final class NetworkCapabilities implements Parcelable { */ @NonNull @SystemApi - public Set getSubIds() { + public Set 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); } @@ -2361,7 +2361,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) { @@ -2378,7 +2378,7 @@ public final class NetworkCapabilities implements Parcelable { *

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"); } @@ -2720,8 +2720,8 @@ public final class NetworkCapabilities implements Parcelable { */ @NonNull @SystemApi - public Builder setSubIds(@NonNull final Set subIds) { - mCaps.setSubIds(subIds); + public Builder setSubscriptionIds(@NonNull final Set subIds) { + mCaps.setSubscriptionIds(subIds); return this; } diff --git a/framework/src/android/net/NetworkRequest.java b/framework/src/android/net/NetworkRequest.java index 3a8a07a55a..e8bd640aad 100644 --- a/framework/src/android/net/NetworkRequest.java +++ b/framework/src/android/net/NetworkRequest.java @@ -508,8 +508,8 @@ public class NetworkRequest implements Parcelable { */ @NonNull @SystemApi - public Builder setSubIds(@NonNull Set subIds) { - mNetworkCapabilities.setSubIds(subIds); + public Builder setSubscriptionIds(@NonNull Set subIds) { + mNetworkCapabilities.setSubscriptionIds(subIds); return this; } } diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 2216e89805..6b9a606202 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -1907,7 +1907,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; @@ -5722,7 +5722,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } mAppOpsManager.checkPackage(callerUid, callerPackageName); - if (!nc.getSubIds().isEmpty()) { + if (!nc.getSubscriptionIds().isEmpty()) { enforceNetworkFactoryPermission(); } } diff --git a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java index e7718b546c..33f2c67646 100644 --- a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java +++ b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java @@ -311,7 +311,7 @@ public class NetworkCapabilitiesTest { .addCapability(NET_CAPABILITY_EIMS) .addCapability(NET_CAPABILITY_NOT_METERED); if (isAtLeastS()) { - netCap.setSubIds(Set.of(TEST_SUBID1, TEST_SUBID2)); + netCap.setSubscriptionIds(Set.of(TEST_SUBID1, TEST_SUBID2)); netCap.setUids(uids); } if (isAtLeastR()) { @@ -641,16 +641,16 @@ public class NetworkCapabilitiesTest { assertTrue(nc2.appliesToUid(22)); // Verify the subscription id list can be combined only when they are equal. - nc1.setSubIds(Set.of(TEST_SUBID1, TEST_SUBID2)); - nc2.setSubIds(Set.of(TEST_SUBID2)); + nc1.setSubscriptionIds(Set.of(TEST_SUBID1, TEST_SUBID2)); + nc2.setSubscriptionIds(Set.of(TEST_SUBID2)); assertThrows(IllegalStateException.class, () -> nc2.combineCapabilities(nc1)); - nc2.setSubIds(Set.of()); + nc2.setSubscriptionIds(Set.of()); assertThrows(IllegalStateException.class, () -> nc2.combineCapabilities(nc1)); - nc2.setSubIds(Set.of(TEST_SUBID2, TEST_SUBID1)); + nc2.setSubscriptionIds(Set.of(TEST_SUBID2, TEST_SUBID1)); nc2.combineCapabilities(nc1); - assertEquals(Set.of(TEST_SUBID2, TEST_SUBID1), nc2.getSubIds()); + assertEquals(Set.of(TEST_SUBID2, TEST_SUBID1), nc2.getSubscriptionIds()); } } @@ -805,20 +805,20 @@ public class NetworkCapabilitiesTest { assertEquals(nc1, nc2); if (isAtLeastS()) { - assertThrows(NullPointerException.class, () -> nc1.setSubIds(null)); - nc1.setSubIds(Set.of()); + assertThrows(NullPointerException.class, () -> nc1.setSubscriptionIds(null)); + nc1.setSubscriptionIds(Set.of()); nc2.set(nc1); assertEquals(nc1, nc2); - nc1.setSubIds(Set.of(TEST_SUBID1)); + nc1.setSubscriptionIds(Set.of(TEST_SUBID1)); nc2.set(nc1); assertEquals(nc1, nc2); - nc2.setSubIds(Set.of(TEST_SUBID2, TEST_SUBID1)); + nc2.setSubscriptionIds(Set.of(TEST_SUBID2, TEST_SUBID1)); nc2.set(nc1); assertEquals(nc1, nc2); - nc2.setSubIds(Set.of(TEST_SUBID3, TEST_SUBID2)); + nc2.setSubscriptionIds(Set.of(TEST_SUBID3, TEST_SUBID2)); assertNotEquals(nc1, nc2); } } @@ -907,8 +907,8 @@ public class NetworkCapabilitiesTest { // satisfy these requests. final NetworkCapabilities nc = new NetworkCapabilities.Builder() .addCapability(NET_CAPABILITY_NOT_VCN_MANAGED) - .setSubIds(new ArraySet<>(subIds)).build(); - assertEquals(new ArraySet<>(subIds), nc.getSubIds()); + .setSubscriptionIds(new ArraySet<>(subIds)).build(); + assertEquals(new ArraySet<>(subIds), nc.getSubscriptionIds()); return nc; } @@ -920,11 +920,11 @@ public class NetworkCapabilitiesTest { final NetworkCapabilities ncWithoutRequestedIds = capsWithSubIds(TEST_SUBID3); final NetworkRequest requestWithoutId = new NetworkRequest.Builder().build(); - assertEmpty(requestWithoutId.networkCapabilities.getSubIds()); + assertEmpty(requestWithoutId.networkCapabilities.getSubscriptionIds()); final NetworkRequest requestWithIds = new NetworkRequest.Builder() - .setSubIds(Set.of(TEST_SUBID1, TEST_SUBID2)).build(); + .setSubscriptionIds(Set.of(TEST_SUBID1, TEST_SUBID2)).build(); assertEquals(Set.of(TEST_SUBID1, TEST_SUBID2), - requestWithIds.networkCapabilities.getSubIds()); + requestWithIds.networkCapabilities.getSubscriptionIds()); assertFalse(requestWithIds.canBeSatisfiedBy(ncWithoutId)); assertTrue(requestWithIds.canBeSatisfiedBy(ncWithOtherIds)); @@ -1132,8 +1132,8 @@ public class NetworkCapabilitiesTest { if (isAtLeastS()) { final NetworkCapabilities nc2 = new NetworkCapabilities.Builder() - .setSubIds(Set.of(TEST_SUBID1)).build(); - assertEquals(Set.of(TEST_SUBID1), nc2.getSubIds()); + .setSubscriptionIds(Set.of(TEST_SUBID1)).build(); + assertEquals(Set.of(TEST_SUBID1), nc2.getSubscriptionIds()); } } } diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 91811f66ea..c2acab8c6d 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -12310,12 +12310,12 @@ public class ConnectivityServiceTest { public void testSubIdsClearedWithoutNetworkFactoryPermission() throws Exception { mServiceContext.setPermission(NETWORK_FACTORY, PERMISSION_DENIED); final NetworkCapabilities nc = new NetworkCapabilities(); - nc.setSubIds(Collections.singleton(Process.myUid())); + nc.setSubscriptionIds(Collections.singleton(Process.myUid())); final NetworkCapabilities result = mService.networkCapabilitiesRestrictedForCallerPermissions( nc, Process.myPid(), Process.myUid()); - assertTrue(result.getSubIds().isEmpty()); + assertTrue(result.getSubscriptionIds().isEmpty()); } @Test @@ -12324,17 +12324,17 @@ public class ConnectivityServiceTest { final Set subIds = Collections.singleton(Process.myUid()); final NetworkCapabilities nc = new NetworkCapabilities(); - nc.setSubIds(subIds); + nc.setSubscriptionIds(subIds); final NetworkCapabilities result = mService.networkCapabilitiesRestrictedForCallerPermissions( nc, Process.myPid(), Process.myUid()); - assertEquals(subIds, result.getSubIds()); + assertEquals(subIds, result.getSubscriptionIds()); } private NetworkRequest getRequestWithSubIds() { return new NetworkRequest.Builder() - .setSubIds(Collections.singleton(Process.myUid())) + .setSubscriptionIds(Collections.singleton(Process.myUid())) .build(); }