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

Commit 4d24b14d authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am d13d7c85: am ba48885b: am 4b7b21ec: Merge "systemui: Handle case when network has been lost"

* commit 'd13d7c85':
  systemui: Handle case when network has been lost
parents a2e207a8 d13d7c85
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ public class SecurityControllerImpl implements SecurityController {
            NetworkCapabilities networkCapabilities =
                    mConnectivityManager.getNetworkCapabilities(network);
            if (DEBUG) Log.d(TAG, "onAvailable " + network.netId + " : " + networkCapabilities);
            if (networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
            if (networkCapabilities != null &&
                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
                setCurrentNetid(network.netId);
            }
        };