From e619d227c9b1625e0267503cc18ab3b4cb10148b Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Wed, 23 Jun 2021 16:08:47 -0700
Subject: [PATCH] isCarrierNetworkActive() should check if the carrier network
 is default

WifiPickerTrackerHelper should use MergedCarrierEntry.isDefaultNetwork()
for isCarrierNetworkActive().

Bug: 191090765
Test: atest WifiPickerTrackerHelperTest
Change-Id: I44d8eed3af019a8d6a30a4b743cad468d1f0469b
---
 src/com/android/settings/wifi/WifiPickerTrackerHelper.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/com/android/settings/wifi/WifiPickerTrackerHelper.java b/src/com/android/settings/wifi/WifiPickerTrackerHelper.java
index 424c818cb65..03795c25971 100644
--- a/src/com/android/settings/wifi/WifiPickerTrackerHelper.java
+++ b/src/com/android/settings/wifi/WifiPickerTrackerHelper.java
@@ -142,11 +142,7 @@ public class WifiPickerTrackerHelper implements LifecycleObserver {
     /** Confirms connection of the carrier network connected with the internet access */
     public boolean isCarrierNetworkActive() {
         final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
-        if (mergedCarrierEntry != null) {
-            return mergedCarrierEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED
-                    && mergedCarrierEntry.hasInternetAccess();
-        }
-        return false;
+        return (mergedCarrierEntry != null && mergedCarrierEntry.isDefaultNetwork());
     }
 
     /** Return the carrier network ssid */