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

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

Browse Source 
* commit '4b7b21ec834cd307e3d122f2d517778b13242dfb':
  systemui: Handle case when network has been lost
This commit is contained in:
Jason Monk
2015-03-24 20:10:22 +00:00
committed by Android Git Automerger
parent b8f28ba07a 4b7b21ec83
commit ba48885b92
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 =
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);
}
};