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

[Provider Model] Carrie Wi-Fi offload toggle request (panel)

Browse Source 
- Do not set Carrier Network together when setting Mobile Data, if
carrner network provision enabled.

Bug: 182324921
Test: manual test
atest -c ProviderModelSliceTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanWorkerTest

Change-Id: Ic8b77fd7b43372f077ba1c8be8fd9a7c3bcff197
This commit is contained in:
Weng Su
2021-04-20 22:27:44 +08:00
parent aeb6200bfe
commit a320fb12a1
4 changed files with 46 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/network/ProviderModelSlice.java
View File

@@ -182,18 +182,18 @@ public class ProviderModelSlice extends WifiSlice {
final boolean isDataEnabled =
isToggleAction ? newState : MobileNetworkUtils.isMobileDataEnabled(mContext);
doCarrierNetworkAction(isToggleAction, isDataEnabled);
doCarrierNetworkAction(isToggleAction, isDataEnabled, defaultSubId);
}
@VisibleForTesting
void doCarrierNetworkAction(boolean isToggleAction, boolean isDataEnabled) {
void doCarrierNetworkAction(boolean isToggleAction, boolean isDataEnabled, int subId) {
final NetworkProviderWorker worker = getWorker();
if (worker == null) {
return;
}
if (isToggleAction) {
worker.setCarrierNetworkEnabled(isDataEnabled);
worker.setCarrierNetworkEnabledIfNeeded(isDataEnabled, subId);
return;
}