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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: I6d99ce94d10c99294cfd001fe4454e52314bf14b
This commit is contained in:
Quang Luong
2021-06-24 15:26:37 +00:00
committed by Automerger Merge Worker

View File

@@ -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 */