diff options
| author | Jason Monk <jmonk@google.com> | 2015-03-24 19:57:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-24 19:57:49 +0000 |
| commit | 4b7b21ec834cd307e3d122f2d517778b13242dfb (patch) | |
| tree | bf6f9d8e03b9550588ddad293e9669c842c943a6 /packages/SystemUI | |
| parent | f5f70b66a3f22ca5e23a4d1e6061f2a36dfb4c92 (diff) | |
| parent | aedae722fd148724d470124aff2f65215baa1a38 (diff) | |
| download | frameworks_base-4b7b21ec834cd307e3d122f2d517778b13242dfb.zip frameworks_base-4b7b21ec834cd307e3d122f2d517778b13242dfb.tar.gz frameworks_base-4b7b21ec834cd307e3d122f2d517778b13242dfb.tar.bz2 | |
Merge "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); } }; |