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

Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40 am: 676498649e am: 42b9b5dcb4 am: 25a3f4177c

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

Change-Id: I4cb1d770785f68e25f91fb8e886426344eeea8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Weng Su
2022-05-25 09:14:35 +00:00
committed by Automerger Merge Worker
parent 81618d155e 25a3f4177c
commit 17d162c8b5
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,16 +117,25 @@ public class WifiPickerTrackerHelper implements LifecycleObserver {
}
/** Return the enabled/disabled state of the carrier network */
public boolean isCarrierNetworkEnabled(int subId) {
return mWifiManager.isCarrierNetworkOffloadEnabled(subId, true /* merged */);
public boolean isCarrierNetworkEnabled() {
final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
if (mergedCarrierEntry == null) {
Log.e(TAG, "Failed to get MergedCarrierEntry to query enabled status");
return false;
}
final boolean isCarrierNetworkEnabled = mergedCarrierEntry.isEnabled();
Log.i(TAG, "isCarrierNetworkEnabled:" + isCarrierNetworkEnabled);
return isCarrierNetworkEnabled;
}
/** Enables/disables the carrier network */
public void setCarrierNetworkEnabled(boolean enabled) {
final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
if (mergedCarrierEntry == null) {
Log.e(TAG, "Unable to get MergedCarrierEntry to set enabled status");
return;
}
Log.i(TAG, "setCarrierNetworkEnabled:" + enabled);
mergedCarrierEntry.setEnabled(enabled);
}