From c09b7f789b79dd33254d8de4b116cc22fa39f073 Mon Sep 17 00:00:00 2001
From: Sundeep Ghuman <sghuman@google.com>
Date: Wed, 26 Jul 2017 20:23:32 -0700
Subject: Force update wifi QS when opening.

This changes expands on ag/2608526 by forcing a refresh of AccessPoints
when the QuickSettings picker is opened. This consolidates logic between
QS and Settings, where in WifiSettings we forceUpdate on cold start.

Bug: b/62680006
Test: 1. Open the quick settings picker
2. Minimize the picker
3. Walk out of range of the networks you say listed in the picker
4. Re-open picker
5. Stale networks should not be shown, latest scan results should be.

Change-Id: Ia944dd3dbeff7d9c3774f04129c07f1ffd4466b2
---
 packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java    | 4 +---
 .../android/systemui/statusbar/policy/AccessPointControllerImpl.java | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
index d9984f768751..ef2831ba5b5f 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
@@ -311,12 +311,10 @@ public class WifiTile extends QSTileImpl<SignalState> {
         public View createDetailView(Context context, View convertView, ViewGroup parent) {
             if (DEBUG) Log.d(TAG, "createDetailView convertView=" + (convertView != null));
             mAccessPoints = null;
-            mWifiController.scanForAccessPoints();
-            fireScanStateChanged(true);
             mItems = QSDetailItems.convertOrInflate(context, convertView, parent);
             mItems.setTagSuffix("Wifi");
             mItems.setCallback(this);
-            updateItems();
+            mWifiController.scanForAccessPoints(); // updates APs and items
             setItemsVisible(mState.value);
             return mItems;
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java
index d1e4963f18ec..c0a683734b8b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessPointControllerImpl.java
@@ -97,8 +97,9 @@ public class AccessPointControllerImpl
 
     @Override
     public void scanForAccessPoints() {
-        if (DEBUG) Log.d(TAG, "scan!");
-        mWifiTracker.forceScan();
+        if (DEBUG) Log.d(TAG, "force update APs!");
+        mWifiTracker.forceUpdate();
+        fireAcccessPointsCallback(mWifiTracker.getAccessPoints());
     }
 
     @Override
-- 
cgit v1.2.3-59-g8ed1b