From f35ca01c3f14c87f9c23dd35754c7d7e8d5ab105 Mon Sep 17 00:00:00 2001 From: Yan Yan Date: Wed, 19 Mar 2025 14:00:00 -0700 Subject: [PATCH] Skip VcnManagerTest if it is not main user Bug: 404436811 Test: CtsVcnTestCases passed CF-Auto on forrest Flag: EXEMPT; test code Change-Id: Ie025346b1995a0d85cef3f676edd2785c3ab86ad --- Vcn/tests/cts/src/android/net/vcn/cts/VcnManagerTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Vcn/tests/cts/src/android/net/vcn/cts/VcnManagerTest.java b/Vcn/tests/cts/src/android/net/vcn/cts/VcnManagerTest.java index 6e6af14cc9..dd8d52454d 100644 --- a/Vcn/tests/cts/src/android/net/vcn/cts/VcnManagerTest.java +++ b/Vcn/tests/cts/src/android/net/vcn/cts/VcnManagerTest.java @@ -78,7 +78,9 @@ import android.net.vcn.cts.TestNetworkWrapper.VcnTestNetworkCallback.Capabilitie import android.os.Build; import android.os.ParcelUuid; import android.os.PersistableBundle; +import android.os.Process; import android.os.SystemClock; +import android.os.UserManager; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -101,6 +103,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.UUID; import java.util.concurrent.BlockingQueue; @@ -175,6 +178,11 @@ public class VcnManagerTest extends VcnTestBase { getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(); + // TODO: b/348715017 Add multi-user support for VCN + // Skip the test if it is not running as a main user + final UserManager userManager = mContext.getSystemService(UserManager.class); + assumeTrue(Objects.equals(userManager.getMainUser(), Process.myUserHandle())); + // Ensure Internet probing check will be performed on VCN networks setCaptivePortalMode(mContext, CAPTIVE_PORTAL_MODE_PROMPT);