joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Skip VcnManagerTest if it is not main user" into main

Browse source
This commit is contained in:
Yan Yan 2025-03-24 12:01:11 -07:00 • committed by Gerrit Code Review
commit 2c1dfa9a4f
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Vcn/tests/cts/src/android/net/vcn/cts/VcnManagerTest.java
View file

@ -77,7 +77,9 @@ import android.net.vcn.cts.TestNetworkWrapper.VcnTestNetworkCallback;
import android.net.vcn.cts.TestNetworkWrapper.VcnTestNetworkCallback.CapabilitiesChangedEvent;
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;
@ -99,6 +101,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;
@ -170,6 +173,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);