Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Create LockDownVpnTracker via dependency for testing"

Browse Source
This commit is contained in:
Chiachang Wang
2022-08-08 00:52:04 +00:00
committed by Gerrit Code Review
parent 7dae698327 090e6690ed
commit 00f823fb2a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/VpnManagerService.java
View File

@@ -138,6 +138,12 @@ public class VpnManagerService extends IVpnManager.Stub {
INetd netd, int userId) { INetd netd, int userId) {
return new Vpn(looper, context, nms, netd, userId, new VpnProfileStore()); 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) { 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"); logw("VPN for user " + user + " not ready yet. Skipping lockdown");
return false; return false;
} }
setLockdownTracker( setLockdownTracker(mDeps.createLockDownVpnTracker(mContext, mHandler, vpn, profile));
new LockdownVpnTracker(mContext, mHandler, vpn, profile));
} }
return true; return true;