Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove usage of NetCapability" am: bd3110f654

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifed84fa84f784d90fdd37aca45eb48571be014af
This commit is contained in:
Treehugger Robot
2021-01-19 06:03:38 +00:00
committed by Automerger Merge Worker
parent a8a4a46077 bd3110f654
commit dd7445523b
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/net/vcn/VcnGatewayConnectionConfig.java
View File

@@ -15,8 +15,6 @@
*/ */
package android.net.vcn; package android.net.vcn;
import static android.net.NetworkCapabilities.NetCapability;
import static com.android.internal.annotations.VisibleForTesting.Visibility; import static com.android.internal.annotations.VisibleForTesting.Visibility;
import android.annotation.IntRange; import android.annotation.IntRange;
@@ -233,7 +231,7 @@ public final class VcnGatewayConnectionConfig {
* *
* @param capability the capability to check for * @param capability the capability to check for
*/ */
public boolean hasExposedCapability(@NetCapability int capability) { public boolean hasExposedCapability(int capability) {
checkValidCapability(capability); checkValidCapability(capability);
return mExposedCapabilities.contains(capability); return mExposedCapabilities.contains(capability);
@@ -254,7 +252,7 @@ public final class VcnGatewayConnectionConfig {
* *
* @param capability the capability to check for * @param capability the capability to check for
*/ */
public boolean requiresUnderlyingCapability(@NetCapability int capability) { public boolean requiresUnderlyingCapability(int capability) {
checkValidCapability(capability); checkValidCapability(capability);
return mUnderlyingCapabilities.contains(capability); return mUnderlyingCapabilities.contains(capability);
@@ -341,7 +339,7 @@ public final class VcnGatewayConnectionConfig {
* @see VcnGatewayConnectionConfig for a list of capabilities may be exposed by a Gateway * @see VcnGatewayConnectionConfig for a list of capabilities may be exposed by a Gateway
* Connection * Connection
*/ */
public Builder addExposedCapability(@NetCapability int exposedCapability) { public Builder addExposedCapability(int exposedCapability) {
checkValidCapability(exposedCapability); checkValidCapability(exposedCapability);
mExposedCapabilities.add(exposedCapability); mExposedCapabilities.add(exposedCapability);
@@ -357,7 +355,7 @@ public final class VcnGatewayConnectionConfig {
* @see VcnGatewayConnectionConfig for a list of capabilities may be exposed by a Gateway * @see VcnGatewayConnectionConfig for a list of capabilities may be exposed by a Gateway
* Connection * Connection
*/ */
public Builder removeExposedCapability(@NetCapability int exposedCapability) { public Builder removeExposedCapability(int exposedCapability) {
checkValidCapability(exposedCapability); checkValidCapability(exposedCapability);
mExposedCapabilities.remove(exposedCapability); mExposedCapabilities.remove(exposedCapability);
@@ -373,7 +371,7 @@ public final class VcnGatewayConnectionConfig {
* @see VcnGatewayConnectionConfig for a list of capabilities may be required of underlying * @see VcnGatewayConnectionConfig for a list of capabilities may be required of underlying
* networks * networks
*/ */
public Builder addRequiredUnderlyingCapability(@NetCapability int underlyingCapability) { public Builder addRequiredUnderlyingCapability(int underlyingCapability) {
checkValidCapability(underlyingCapability); checkValidCapability(underlyingCapability);
mUnderlyingCapabilities.add(underlyingCapability); mUnderlyingCapabilities.add(underlyingCapability);
@@ -393,7 +391,7 @@ public final class VcnGatewayConnectionConfig {
* @see VcnGatewayConnectionConfig for a list of capabilities may be required of underlying * @see VcnGatewayConnectionConfig for a list of capabilities may be required of underlying
* networks * networks
*/ */
public Builder removeRequiredUnderlyingCapability(@NetCapability int underlyingCapability) { public Builder removeRequiredUnderlyingCapability(int underlyingCapability) {
checkValidCapability(underlyingCapability); checkValidCapability(underlyingCapability);
mUnderlyingCapabilities.remove(underlyingCapability); mUnderlyingCapabilities.remove(underlyingCapability);