Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00f823fb authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge "Create LockDownVpnTracker via dependency for testing"

parents 7dae6983 090e6690

services/core/java/com/android/server/VpnManagerService.java

+7 −2
Original line number Diff line number Diff line
@@ -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;