From 226af1dbfdac3112f41982ebf2e9fd1a0f3cc323 Mon Sep 17 00:00:00 2001 From: Benedict Wong Date: Fri, 12 Mar 2021 16:12:58 -0800 Subject: Hide required underlying caps APIs VCN underlying network capabilities should be transport-dependent in order to allow using anything other than the INTERNET capability for VCN types that support wifi offload. Specifically, if underlying network capabilities are not transport-dependent, and Wifi only ever supports the INTERNET capability, the VCN is unable to utilize wifi offload together with requiring NET_CAPABILITY_IMS or NET_CAPABILITY_CBS, since the IMS or CBS capability would be required for both cellular and wifi underlying networks. Until such time as a per-transport capability set is allowed, hide the exposedCapability pieces, and document that all underlying networks MUST have INTERNET capability in order to be used. Bug: 182219992 Test: atest FrameworksVcnTests Test: atest CtsVcnTestCases Change-Id: I50d7f1be42e0e001f1413a3d5fe8aa4b7afec223 --- .../java/android/net/vcn/VcnGatewayConnectionConfigTest.java | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'tests') diff --git a/tests/vcn/java/android/net/vcn/VcnGatewayConnectionConfigTest.java b/tests/vcn/java/android/net/vcn/VcnGatewayConnectionConfigTest.java index 5b17aadc50a6..8a0c923d5fb0 100644 --- a/tests/vcn/java/android/net/vcn/VcnGatewayConnectionConfigTest.java +++ b/tests/vcn/java/android/net/vcn/VcnGatewayConnectionConfigTest.java @@ -108,16 +108,6 @@ public class VcnGatewayConnectionConfigTest { } } - @Test - public void testBuilderRequiresNonEmptyUnderlyingCaps() { - try { - newBuilder().addExposedCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET).build(); - - fail("Expected exception due to invalid required underlying capabilities"); - } catch (IllegalArgumentException e) { - } - } - @Test public void testBuilderRequiresNonNullRetryInterval() { try { -- cgit v1.2.3