Merge "VCN: Remove ArrayUtils hidden API usages" into main (1a42afce) · Commits · e / os / android_frameworks_base

core/java/android/net/vcn/VcnGatewayConnectionConfig.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import android.os.PersistableBundle;
		import android.util.ArraySet;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.Preconditions;
		import com.android.server.vcn.util.PersistableBundleUtils;

		@@ -434,7 +433,14 @@ public final class VcnGatewayConnectionConfig {
		@NonNull
		public int[] getExposedCapabilities() {
		// Sorted set guarantees ordering
		return ArrayUtils.convertToIntArray(new ArrayList<>(mExposedCapabilities));
		final int[] caps = new int[mExposedCapabilities.size()];

		int i = 0;
		for (int c : mExposedCapabilities) {
		caps[i++] = c;
		}

		return caps;
		}

		/**

+7 −3

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.os.Parcelable;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.annotations.VisibleForTesting.Visibility;
		import com.android.internal.util.ArrayUtils;

		import java.util.Arrays;
		import java.util.Objects;
		@@ -114,8 +113,13 @@ public final class VcnUnderlyingNetworkSpecifier extends NetworkSpecifier implem
		@Override
		public boolean canBeSatisfiedBy(NetworkSpecifier other) {
		if (other instanceof TelephonyNetworkSpecifier) {
		return ArrayUtils.contains(
		mSubIds, ((TelephonyNetworkSpecifier) other).getSubscriptionId());
		final int targetSubId = ((TelephonyNetworkSpecifier) other).getSubscriptionId();
		for (int subId : mSubIds) {
		if (targetSubId == subId) {
		return true;
		}
		}
		return false;
		}
		// TODO(b/180140053): Allow matching against WifiNetworkAgentSpecifier