commit d13d7c85dc6b87a83cf06b7514146cc32413dcaa
author Jason Monk <jmonk@google.com> Tue Mar 24 20:16:20 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 24 20:16:20 2015 +0000
tree 393f52b0f2e7b83fdaf0159eb0c1ac65f65a0a44
parent 0ab653cb1d50ec4a43f3cbb8c779b5d66f0118ea
parent ba48885b9253dbb0f0c243ffc777c92b01a77727

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

* commit 'ba48885b9253dbb0f0c243ffc777c92b01a77727':
  systemui: Handle case when network has been lost

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

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 @@
             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);
             }
         };