commit 4e1e87212a0b015009f104d84523e6cf5a362cd0
author Oli Lan <olilan@google.com> Wed Jan 18 15:35:56 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 18 15:35:56 2023 +0000
tree c28bda28f40209608227e6a0c9306cec62f1a2d6
parent e3496f966c19ac0732b3637b940955057a08149d
parent f738c40e8ccb267150838cc108f1d70b3e703fca

Merge "Update VpnManagerServiceTest to work with lockdown VPN main user changes." am: f738c40e8c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2376237

Change-Id: I274a0a11a13aae5b79cef2ee0ac70301e3b0a087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/unit/java/com/android/server/VpnManagerServiceTest.java

diff --git a/tests/unit/java/com/android/server/VpnManagerServiceTest.java b/tests/unit/java/com/android/server/VpnManagerServiceTest.java
index c8a93a6..deb56ef 100644
--- a/tests/unit/java/com/android/server/VpnManagerServiceTest.java
+++ b/tests/unit/java/com/android/server/VpnManagerServiceTest.java
@@ -131,6 +131,11 @@
                 Vpn vpn, VpnProfile profile) {
             return mLockdownVpnTracker;
         }
+
+        @Override
+        public @UserIdInt int getMainUserId() {
+            return UserHandle.USER_SYSTEM;
+        }
     }
 
     @Before