| commit | be2215c08617ba145b5e404199214e3c48a4f37b | [log] [tgz] |
|---|---|---|
| author | Oli Lan <olilan@google.com> | Wed Jan 18 16:14:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 18 16:14:01 2023 +0000 |
| tree | 22aa141f0069adb2f2585c0b6a21e02f0a3d7ef5 | |
| parent | bd91ec37ea5521b0c3aaa06063d6bfb9124b5aa9 [diff] | |
| parent | 494fe7c627621c5b7bb769a8c4729b504ed6cb9b [diff] |
Merge "Update VpnManagerServiceTest to work with lockdown VPN main user changes." am: f738c40e8c am: 494fe7c627 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2376237 Change-Id: I3e34200e3b328ed1b7878fca83644bf5d7a64f94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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