diff options
| author | Jason Monk <jmonk@google.com> | 2015-03-24 20:10:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-24 20:10:22 +0000 |
| commit | ba48885b9253dbb0f0c243ffc777c92b01a77727 (patch) | |
| tree | 9471b70e1f1794badd906c108c2396b720ece13a /packages/SystemUI | |
| parent | b8f28ba07afcae2a3cd577d0050686da70b0611a (diff) | |
| parent | 4b7b21ec834cd307e3d122f2d517778b13242dfb (diff) | |
| download | frameworks_base-ba48885b9253dbb0f0c243ffc777c92b01a77727.zip frameworks_base-ba48885b9253dbb0f0c243ffc777c92b01a77727.tar.gz frameworks_base-ba48885b9253dbb0f0c243ffc777c92b01a77727.tar.bz2 | |
am 4b7b21ec: Merge "systemui: Handle case when network has been lost"
* commit '4b7b21ec834cd307e3d122f2d517778b13242dfb':
systemui: Handle case when network has been lost
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java index 2fbb812..f0dd943 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java @@ -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); } }; |