From 38a8287abb6d4fa8f024490fe7989068cefec90b Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Fri, 8 Nov 2019 17:01:39 -0800
Subject: [PATCH] Use WifiPickerTracker to get connected WifiEntry

Use WifiPickerTracker.getConnectedWifiEntry API to get a WifiEntry to
display at the top of the Wifi picker as the connected network.

Test: manual - visual verification of connected entry at the top of the
wifi picker.
Bug: 70983952

Change-Id: Iec6e1c9fe950397f62350194d8b24791a7eac30a
---
 src/com/android/settings/wifi/WifiSettings2.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java
index c06aef7bd6f..3c71e362f39 100644
--- a/src/com/android/settings/wifi/WifiSettings2.java
+++ b/src/com/android/settings/wifi/WifiSettings2.java
@@ -486,6 +486,22 @@ public class WifiSettings2 extends RestrictedSettingsFragment
         mConnectedWifiEntryPreferenceCategory.setVisible(true);
         mWifiEntryPreferenceCategory.setVisible(true);
 
+        final WifiEntry connectedEntry = mWifiPickerTracker.getConnectedWifiEntry();
+        if (connectedEntry != null) {
+            final LongPressWifiEntryPreference connectedPref =
+                    mConnectedWifiEntryPreferenceCategory.findPreference(connectedEntry.getKey());
+            if (connectedPref == null || connectedPref.getWifiEntry() != connectedEntry) {
+                mConnectedWifiEntryPreferenceCategory.removeAll();
+                final LongPressWifiEntryPreference pref =
+                        createLongPressWifiEntryPreference(connectedEntry);
+                pref.setKey(connectedEntry.getKey());
+                pref.refresh();
+                mConnectedWifiEntryPreferenceCategory.addPreference(pref);
+            }
+        } else {
+            mConnectedWifiEntryPreferenceCategory.removeAll();
+        }
+
         int index = 0;
         cacheRemoveAllPrefs(mWifiEntryPreferenceCategory);
         List<WifiEntry> wifiEntries = mWifiPickerTracker.getWifiEntries();