PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Quang Luong
2021-06-24 15:12:38 +00:00
committed by Android (Google) Code Review
parent 5b7518fdf7 e619d227c9
commit afc0bd763c
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/WifiPickerTrackerHelper.java
View File

@@ -142,11 +142,7 @@ public class WifiPickerTrackerHelper implements LifecycleObserver {
/** Confirms connection of the carrier network connected with the internet access */ /** Confirms connection of the carrier network connected with the internet access */
public boolean isCarrierNetworkActive() { public boolean isCarrierNetworkActive() {
final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry(); final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
if (mergedCarrierEntry != null) { return (mergedCarrierEntry != null && mergedCarrierEntry.isDefaultNetwork());
return mergedCarrierEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED
&& mergedCarrierEntry.hasInternetAccess();
}
return false;
} }
/** Return the carrier network ssid */ /** Return the carrier network ssid */