LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds"

Browse Source
This commit is contained in:
Treehugger Robot
2021-04-22 04:43:26 +00:00
committed by Gerrit Code Review
parent 82efa81cd7 3c409e8ce7
commit 4995a0bbaa
6 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/api/system-current.txt
View File

@@ -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<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);
@@ -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<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);
}
@@ -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<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 {

20
framework/src/android/net/NetworkCapabilities.java
View File

@@ -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<Integer> subIds) {
public NetworkCapabilities setSubscriptionIds(@NonNull Set<Integer> subIds) {
mSubIds = new ArraySet(Objects.requireNonNull(subIds));
return this;
}
@@ -2345,14 +2345,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);
}
@@ -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 {
* <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");
}
@@ -2720,8 +2720,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;
}

4
framework/src/android/net/NetworkRequest.java
View File

@@ -512,8 +512,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;
}
}

4
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -1948,7 +1948,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;
@@ -5763,7 +5763,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
mAppOpsManager.checkPackage(callerUid, callerPackageName);
if (!nc.getSubIds().isEmpty()) {
if (!nc.getSubscriptionIds().isEmpty()) {
enforceNetworkFactoryPermission();
}
}

36
tests/net/common/java/android/net/NetworkCapabilitiesTest.java
View File

@@ -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());
}
}
}

10
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -12314,12 +12314,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
@@ -12328,17 +12328,17 @@ public class ConnectivityServiceTest {
final Set<Integer> 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();
}