commit 8f421b2dbf873a2023d88e918049fe44233e4dd5
author Quang Luong <qal@google.com> Mon May 10 17:48:53 2021 -0700
committer Quang Luong <qal@google.com> Mon May 10 17:48:53 2021 -0700
tree fe55b4d63960a29856269e77db4835b5073d5f1b
parent 48535ffd29a6f45ad623d692843be98d054354cf

Refresh security pref in Network Details page

Security type of WifiEntry may change based on available
scans/configs/the current connection for entries that can support
multiple security types. Refresh the security string every time the
WifiEntry is updated.

Bug: 185914718
Test: manual inspection that connected wifi entry has the correct
security string

Change-Id: I5f3b7274f1e6b68de414493a6619555ee9b17e23

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
index b66633e..18cd553 100644
--- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -87,14 +87,10 @@
 import com.android.settingslib.widget.LayoutPreference;
 import com.android.wifitrackerlib.WifiEntry;
 import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
-import com.android.wifitrackerlib.WifiEntry.ConnectCallback.ConnectStatus;
 import com.android.wifitrackerlib.WifiEntry.ConnectedInfo;
 import com.android.wifitrackerlib.WifiEntry.DisconnectCallback;
-import com.android.wifitrackerlib.WifiEntry.DisconnectCallback.DisconnectStatus;
 import com.android.wifitrackerlib.WifiEntry.ForgetCallback;
-import com.android.wifitrackerlib.WifiEntry.ForgetCallback.ForgetStatus;
 import com.android.wifitrackerlib.WifiEntry.SignInCallback;
-import com.android.wifitrackerlib.WifiEntry.SignInCallback.SignInStatus;
 import com.android.wifitrackerlib.WifiEntry.WifiEntryCallback;
 
 import java.net.Inet4Address;
@@ -390,8 +386,6 @@
 
         mIpv6Category = screen.findPreference(KEY_IPV6_CATEGORY);
         mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF);
-
-        mSecurityPref.setSummary(mWifiEntry.getSecurityString(false /* concise */));
     }
 
     /**
@@ -545,6 +539,8 @@
         refreshRssiViews();
         // Frequency Pref
         refreshFrequency();
+        // Security Pref
+        refreshSecurity();
         // Transmit Link Speed Pref
         refreshTxSpeed();
         // Receive Link Speed Pref
@@ -646,6 +642,10 @@
         mFrequencyPref.setVisible(true);
     }
 
+    private void refreshSecurity() {
+        mSecurityPref.setSummary(mWifiEntry.getSecurityString(false /* concise */));
+    }
+
     private void refreshTxSpeed() {
         if (mWifiInfo == null
                 || mWifiEntry.getConnectedState() != WifiEntry.CONNECTED_STATE_CONNECTED) {