From a296c69cc2c798acd070b843c699a9cd1e337ff4 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 2 Jun 2015 14:52:22 -0400
Subject: [PATCH] Handle network info updates while scanning is paused

Bug: 21581533
Change-Id: I4216c3e9b64cb758e32dd93c39061f9d7a642ee0
---
 .../android/settingslib/wifi/WifiTracker.java | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
index f32493375e9eb..cf3b7c873d598 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
@@ -357,17 +357,19 @@ public class WifiTracker {
     }
 
     private void updateNetworkInfo(NetworkInfo networkInfo) {
-        /* sticky broadcasts can call this when wifi is disabled */
-        if (!mWifiManager.isWifiEnabled()) {
-            mScanner.pause();
-            return;
-        }
+        if (mScanner != null) {
+            /* sticky broadcasts can call this when wifi is disabled */
+            if (!mWifiManager.isWifiEnabled()) {
+                mScanner.pause();
+                return;
+            }
 
-        if (networkInfo != null &&
-                networkInfo.getDetailedState() == DetailedState.OBTAINING_IPADDR) {
-            mScanner.pause();
-        } else {
-            mScanner.resume();
+            if (networkInfo != null &&
+                    networkInfo.getDetailedState() == DetailedState.OBTAINING_IPADDR) {
+                mScanner.pause();
+            } else {
+                mScanner.resume();
+            }
         }
 
         mLastInfo = mWifiManager.getConnectionInfo();