summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author chiachangwang <chiachangwang@google.com> 2022-07-07 06:24:09 +0000
committer chiachangwang <chiachangwang@google.com> 2022-07-20 09:44:11 +0000
commit090e6690ed2b7476f9b65b200c2bb95f6d231176 (patch)
treef9a81898ba178af333f96e7ac26570a74b92a765
parent59b496c31d5f9f1bfdca442f1096a7dc661d184c (diff)
Create LockDownVpnTracker via dependency for testing
Bug: 230548427 Test: m ; atest FrameworksNetTests Change-Id: I2d066649598668ab7026e8772ec86f861e91c405
-rw-r--r--services/core/java/com/android/server/VpnManagerService.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/VpnManagerService.java b/services/core/java/com/android/server/VpnManagerService.java
index c9a420eabbd8..32dc47019fd5 100644
--- a/services/core/java/com/android/server/VpnManagerService.java
+++ b/services/core/java/com/android/server/VpnManagerService.java
@@ -138,6 +138,12 @@ public class VpnManagerService extends IVpnManager.Stub {
INetd netd, int userId) {
return new Vpn(looper, context, nms, netd, userId, new VpnProfileStore());
}
+
+ /** Create a LockDownVpnTracker. */
+ public LockdownVpnTracker createLockDownVpnTracker(Context context, Handler handler,
+ Vpn vpn, VpnProfile profile) {
+ return new LockdownVpnTracker(context, handler, vpn, profile);
+ }
}
public VpnManagerService(Context context, Dependencies deps) {
@@ -502,8 +508,7 @@ public class VpnManagerService extends IVpnManager.Stub {
logw("VPN for user " + user + " not ready yet. Skipping lockdown");
return false;
}
- setLockdownTracker(
- new LockdownVpnTracker(mContext, mHandler, vpn, profile));
+ setLockdownTracker(mDeps.createLockDownVpnTracker(mContext, mHandler, vpn, profile));
}
return true;