From 6b254d56498e3935a808c49fe8147cfbe5bb790a Mon Sep 17 00:00:00 2001 From: Calvin On Date: Thu, 13 Apr 2023 14:06:04 -0700 Subject: [PATCH] Don't run PacProxyManagerTest case without WebView support. PAC proxies rely on the Javascript interpreter in WebView, so devices without WebView cannot support PAC proxies. Bug: 253978428 Test: atest CtsNetTestCases Change-Id: I3905a8f0cfc0518db994d0e417ed107163523c1d --- tests/cts/net/src/android/net/cts/PacProxyManagerTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/cts/net/src/android/net/cts/PacProxyManagerTest.java b/tests/cts/net/src/android/net/cts/PacProxyManagerTest.java index f0c876730d..4854901196 100644 --- a/tests/cts/net/src/android/net/cts/PacProxyManagerTest.java +++ b/tests/cts/net/src/android/net/cts/PacProxyManagerTest.java @@ -23,12 +23,14 @@ import static com.android.testutils.TestPermissionUtil.runAsShell; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeTrue; import android.app.Instrumentation; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.net.Network; import android.net.PacProxyManager; @@ -150,6 +152,9 @@ public final class PacProxyManagerTest { @AppModeFull(reason = "Instant apps can't bind sockets to localhost for a test proxy server") @Test public void testSetCurrentProxyScriptUrl() throws Exception { + // Devices without WebView/JavaScript cannot support PAC proxies + assumeTrue(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WEBVIEW)); + // Register a PacProxyInstalledListener final TestPacProxyInstalledListener listener = new TestPacProxyInstalledListener(); final Executor executor = (Runnable r) -> r.run();