Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jason Monk
2015-03-24 19:57:48 +00:00
committed by Gerrit Code Review
parent f5f70b66a3 aedae722fd
commit 4b7b21ec83
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
View File

@@ -190,7 +190,8 @@ public class SecurityControllerImpl implements SecurityController {
NetworkCapabilities networkCapabilities = NetworkCapabilities networkCapabilities =
mConnectivityManager.getNetworkCapabilities(network); mConnectivityManager.getNetworkCapabilities(network);
if (DEBUG) Log.d(TAG, "onAvailable " + network.netId + " : " + networkCapabilities); 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); setCurrentNetid(network.netId);
} }
}; };