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

Commit 6a2f1206 authored by Gabriele M's avatar Gabriele M
Browse files

Revert "Prevent deadlock when using always-on legacy VPNs" 

A different fix will be applied with follow-up changes. This also
doesn't appear to completely fix the problem (REGRESSION-1963).

This reverts commit ac496f4a.

Change-Id: Ie77e2d4c58ce8c6be68f125d3311ecced6e1e7ca
parent d90e9176

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

+6 −8
Original line number Diff line number Diff line
@@ -3241,7 +3241,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            log("reportNetworkConnectivity(" + nai.network.netId + ", " + hasConnectivity +

                    ") by " + uid);

        }

        synchronized (mVpns) {

        synchronized (nai) {

            // Validating a network that has not yet connected could result in a call to

            // rematchNetworkAndRequests() which is not meant to work on such networks.
@@ -3252,7 +3251,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            nai.networkMonitor.sendMessage(NetworkMonitor.CMD_FORCE_REEVALUATION, uid);

        }

    }

    }



    private ProxyInfo getDefaultProxy() {

        // this information is already available as a world read/writable jvm property