From 39654c33cf1a9c1125ba99c8384d6514ba8132c7 Mon Sep 17 00:00:00 2001
From: Hansen Kurli <hkurli@google.com>
Date: Tue, 12 Sep 2023 15:05:46 +0800
Subject: [PATCH] Mock Vpn.setLockdown()
Call setRequireVpnForUids directly to enable lockdown instead of
calling the real Vpn method.
Bug: 230548427
Test: atest FrameworksNetTests
Change-Id: I91ec59f7542d145e9250a7e7a414593db3d99424
---
.../unit/java/com/android/server/ConnectivityServiceTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
index af0220ed26..bc840c218f 100755
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -10206,7 +10206,8 @@ public class ConnectivityServiceTest {
// Init lockdown state to simulate LockdownVpnTracker behavior.
mCm.setLegacyLockdownVpnEnabled(true);
mMockVpn.setEnableTeardown(false);
- mMockVpn.setLockdown(true);
+ final Set<Range<Integer>> ranges = UidRange.toIntRanges(Set.of(PRIMARY_UIDRANGE));
+ mCm.setRequireVpnForUids(true /* requireVpn */, ranges);
// Bring up a network.
final LinkProperties cellLp = new LinkProperties();
--
GitLab