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: Ibe201c94dadde5ac0498246a3d48d501a720e0b4
This commit is contained in:
@@ -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 */
|
||||
|
Reference in New Issue
Block a user