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

am: bfa8b89ed1 Change-Id: Ia5bcd39c177c650a4e0174fc69d5078bc12b9e4c
2019-08-30 08:40:14 -07:00
parent 1224bc8ec2 bfa8b89ed1
commit 2ffc7b4c01
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);
            }