From 494007e3becf50f189535d2fc168d7374c9749ae Mon Sep 17 00:00:00 2001
From: yinxu <yinxu@google.com>
Date: Tue, 8 Jun 2021 16:01:32 -0700
Subject: [PATCH] Only update Carrier Merged WiFi state if it is default

Bug: 189528935
Test: Manual test
Change-Id: I93c94d1e4d5e61ef9d6bf4ad8ecffbd88cfc4c4d
---
 .../systemui/statusbar/policy/WifiSignalController.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
index b9b62b415c00f..753def0b0f1c6 100644
--- 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);
         }