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

am: c07aed0fd4 Change-Id: If5b3f6f1d397d3ac35b509a2e634a60933f2df6c
2019-08-30 08:30:10 -07:00
parent 9fe20bf048 0c27ddf71b
commit bfa8b89ed1
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -4551,7 +4551,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
                    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);
            }