From bae0fb30f982d542fde2a6f04cd89fda6059e49a Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Mon, 22 Mar 2021 14:57:14 -0700 Subject: [PATCH] Add tests for NetCapability#getCapabilityCarrierName Test: atest ConnectivityManagerTest Fix: 183553812 Change-Id: I60801bb86302b57f6d72ea903d98a8249fae4555 --- .../src/android/net/cts/ConnectivityManagerTest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 0255f5993b..e9255708e1 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -132,6 +132,8 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.ArrayUtils; import com.android.networkstack.apishim.ConnectivityManagerShimImpl; +import com.android.networkstack.apishim.ConstantsShim; +import com.android.networkstack.apishim.NetworkInformationShimImpl; import com.android.networkstack.apishim.common.ConnectivityManagerShim; import com.android.testutils.CompatUtil; import com.android.testutils.DevSdkIgnoreRule; @@ -1901,4 +1903,13 @@ public class ConnectivityManagerTest { assumeTrue(TestUtils.shouldTestSApis()); runWithShellPermissionIdentity(() -> doTestLegacyLockdownEnabled(), NETWORK_SETTINGS); } + + @Test + public void testGetCapabilityCarrierName() { + assumeTrue(TestUtils.shouldTestSApis()); + assertEquals("ENTERPRISE", NetworkInformationShimImpl.newInstance() + .getCapabilityCarrierName(ConstantsShim.NET_CAPABILITY_ENTERPRISE)); + assertNull(NetworkInformationShimImpl.newInstance() + .getCapabilityCarrierName(ConstantsShim.NET_CAPABILITY_NOT_VCN_MANAGED)); + } }