Merge "Only update Carrier Merged WiFi state if it is default" into sc-dev

2021-06-09 18:13:15 +00:00
parent d8b5c05ff1 494007e3be
commit 0732d74669
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
@@ -86,7 +86,9 @@ public class WifiSignalController extends
    @Override
    public void notifyListeners(SignalCallback callback) {
        if (mCurrentState.isCarrierMerged) {
-            notifyListenersForCarrierWifi(callback);
+            if (mCurrentState.isDefault) {
+                notifyListenersForCarrierWifi(callback);
+            }
        } else {
            notifyListenersForNonCarrierWifi(callback);
        }