From aa9db67edcf6729f5c837ca77e42d0bcdc82baf4 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Thu, 15 Apr 2021 10:22:57 +0900 Subject: [PATCH] Import ConnectivityManager.BLOCKED_REASON_* from ConstantsShim. This is needed for the tests to compile in mainline-prod. Bug: 165835257 Test: atest CtsNetTestCases:android.net.ConnectivityManagerTest Change-Id: I32924824e9968996f379e31f1b28eb6a8f29bc5d --- .../cts/net/src/android/net/cts/ConnectivityManagerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index d67eb236f1..18617e85d6 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -28,8 +28,6 @@ import static android.content.pm.PackageManager.FEATURE_WIFI; import static android.content.pm.PackageManager.FEATURE_WIFI_DIRECT; import static android.content.pm.PackageManager.GET_PERMISSIONS; import static android.content.pm.PackageManager.PERMISSION_GRANTED; -import static android.net.ConnectivityManager.BLOCKED_REASON_LOCKDOWN_VPN; -import static android.net.ConnectivityManager.BLOCKED_REASON_NONE; import static android.net.ConnectivityManager.TYPE_BLUETOOTH; import static android.net.ConnectivityManager.TYPE_ETHERNET; import static android.net.ConnectivityManager.TYPE_MOBILE_CBS; @@ -64,6 +62,8 @@ import static android.system.OsConstants.AF_UNSPEC; import static com.android.compatibility.common.util.SystemUtil.runShellCommand; import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity; +import static com.android.networkstack.apishim.ConstantsShim.BLOCKED_REASON_LOCKDOWN_VPN; +import static com.android.networkstack.apishim.ConstantsShim.BLOCKED_REASON_NONE; import static com.android.testutils.MiscAsserts.assertThrows; import static com.android.testutils.TestPermissionUtil.runAsShell;