commit 2e15c3578ac4c4c868fb28b4a0b8408e77e7f519
author junyulai <junyulai@google.com> Fri Aug 30 08:30:10 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 30 08:30:10 2019 -0700
tree dbbe55bea623fadcd1093e242d6a03e078d21dce
parent 7958bb6ac804e3498e7b008900776088fe3b9f83
parent 2bdd029792a0454211dde538fca02f27989fed62

Merge "Fix LockdownVpnTracker deadlock when resetting legacy Always-On VPN"
am: c07aed0fd4

Change-Id: If5b3f6f1d397d3ac35b509a2e634a60933f2df6c

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 01b74a6..2a2dc3d 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -4551,7 +4551,7 @@
                     Slog.w(TAG, "VPN for user " + user + " not ready yet. Skipping lockdown");
                     return false;
                 }
-                setLockdownTracker(new LockdownVpnTracker(mContext, mNMS, this, vpn, profile));
+                setLockdownTracker(new LockdownVpnTracker(mContext, this, mHandler, vpn, profile));
             } else {
                 setLockdownTracker(null);
             }