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

Create LockDownVpnTracker via dependency for testing

Browse Source 
Bug: 230548427
Test: m ; atest FrameworksNetTests
Change-Id: I2d066649598668ab7026e8772ec86f861e91c405
This commit is contained in:
chiachangwang
2022-07-07 06:24:09 +00:00
parent 59b496c31d
commit 090e6690ed
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) {
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;