commit f738c40e8ccb267150838cc108f1d70b3e703fca
author Oli Lan <olilan@google.com> Wed Jan 18 15:32:14 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 18 15:32:14 2023 +0000
tree 561975b1ae3bb195901721910693150061327fb2
parent 3d5efcb7e9047b41d0f02693348f8667dfbdd4c0
parent 04898c7a2be42d392bcae98c7484b5a0d0a0107c

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

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