Merge "systemui: Handle case when network has been lost"

This commit is contained in:
Jason Monk
2015-03-24 19:57:48 +00:00
committed by Gerrit Code Review

View File

@@ -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);
}
};