commit 8efea18ca2b5ed67baf6597cb2dc0d877cfe7bb5
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 06 11:29:05 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 06 11:29:05 2020 +0000
tree 81d16a940144c42e886584abc21d3fa059984144
parent 36b00c5e4f872759ed7702ea9c5c0f74c0d564d2
parent 62e3a8276e21aa1720c0b2a72c683c1d5724202d

Merge "[Wi-Fi] Fix EntityHeader signal strength icon invisible problem" into rvc-dev

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

diff --git a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
index 6ad4c94..1b54e1a 100644
--- a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
+++ b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
@@ -235,6 +235,13 @@
     public void refreshPreferences() {
         final PreferenceScreen screen = getPreferenceScreen();
         for (AbstractPreferenceController controller : mControllers) {
+            // WifiDetailPreferenceController2 gets the callback WifiEntryCallback#onUpdated,
+            // it can control the visibility change by itself.
+            // And WifiDetailPreferenceController2#updatePreference renew mEntityHeaderController
+            // instance which will cause icon reset.
+            if (controller instanceof WifiDetailPreferenceController2) {
+                continue;
+            }
             controller.displayPreference(screen);
         }
     }