diff options
| author | Jason Monk <jmonk@google.com> | 2015-03-24 20:23:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-24 20:23:16 +0000 |
| commit | 4d24b14d129871692b4c844d71e0179d0403e3a4 (patch) | |
| tree | 280d5b4d81a69437c0bd10c44c905cc633e60912 /packages/SystemUI/src/com/android/systemui | |
| parent | a2e207a807b7d4488c3d5a21ff686c811b1638be (diff) | |
| parent | d13d7c85dc6b87a83cf06b7514146cc32413dcaa (diff) | |
| download | frameworks_base-4d24b14d129871692b4c844d71e0179d0403e3a4.zip frameworks_base-4d24b14d129871692b4c844d71e0179d0403e3a4.tar.gz frameworks_base-4d24b14d129871692b4c844d71e0179d0403e3a4.tar.bz2 | |
am d13d7c85: am ba48885b: am 4b7b21ec: Merge "systemui: Handle case when network has been lost"
* commit 'd13d7c85dc6b87a83cf06b7514146cc32413dcaa':
systemui: Handle case when network has been lost
Diffstat (limited to 'packages/SystemUI/src/com/android/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); } }; |