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

Commit 875a152c authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Create LockDownVpnTracker via dependency for testing" am: 00f823fb am: 43c5ac01 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147799



Change-Id: Icc12f21d78c30f89c19715a981762032f6d31933
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e883e98a 43c5ac01

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;