commit afc0bd763c5504df86c2fadbdb59648c32276a65
author Quang Luong <qal@google.com> Thu Jun 24 15:12:38 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 24 15:12:38 2021 +0000
tree 9b6f3b5f39491a03e9f5c0951c8be8cee5bd2150
parent 5b7518fdf77000e96f654b88d35a19941b9ceca0
parent e619d227c9b1625e0267503cc18ab3b4cb10148b

Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev

src/com/android/settings/wifi/WifiPickerTrackerHelper.java

diff --git a/src/com/android/settings/wifi/WifiPickerTrackerHelper.java b/src/com/android/settings/wifi/WifiPickerTrackerHelper.java
index 424c818..03795c2 100644
--- a/src/com/android/settings/wifi/WifiPickerTrackerHelper.java
+++ b/src/com/android/settings/wifi/WifiPickerTrackerHelper.java
@@ -142,11 +142,7 @@
     /** 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 */