From 37c39d0af6ce631b521d8f53eb1c328c7a7f4b41 Mon Sep 17 00:00:00 2001
From: Paul Hu <paulhu@google.com>
Date: Tue, 6 May 2025 02:39:52 +0000
Subject: [PATCH] Skip network requests in MultinetworkApiTest for instant mode

MultinetworkApiTest would attempt to request cellular and Wi-Fi
network connections in test setup. This requires the
CHANGE_NETWORK_STATE permission, which is not granted to
the instant app. Therefore, skip the network requests if the
tests are running in instant mode.

Bug: 413261962
Test: atest android.net.cts.MultinetworkApiTest --instant
Flag: EXEMPT bug fix
Change-Id: I64366a4f2528402d3050adb54bb0aea352c53088
---
 .../cts/net/src/android/net/cts/MultinetworkApiTest.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/cts/net/src/android/net/cts/MultinetworkApiTest.java b/tests/cts/net/src/android/net/cts/MultinetworkApiTest.java
index 6ae9f1dc5c..14ef98a401 100644
--- a/tests/cts/net/src/android/net/cts/MultinetworkApiTest.java
+++ b/tests/cts/net/src/android/net/cts/MultinetworkApiTest.java
@@ -112,8 +112,12 @@ public class MultinetworkApiTest {
         final Context context = InstrumentationRegistry.getInstrumentation().getContext();
         mCM = context.getSystemService(ConnectivityManager.class);
         mCtsNetUtils = new CtsNetUtils(context);
-        mNetworkCallbackRule.requestCellIfSupported();
-        mNetworkCallbackRule.requestWifiIfSupported();
+        // In instant mode, do not request cell or Wi-Fi connection, as this requires the
+        // CHANGE_NETWORK_STATE permission which cannot be granted.
+        if (!context.getApplicationInfo().isInstantApp()) {
+            mNetworkCallbackRule.requestCellIfSupported();
+            mNetworkCallbackRule.requestWifiIfSupported();
+        }
     }
 
     @Test