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: 395c675770

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

Change-Id: I65e7ce206f05c3dbdb871b5b793514f758f5ef93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Weng Su
2022-05-25 08:30:01 +00:00
committed by Automerger Merge Worker
parent 82ed2bc190 395c675770
commit 3146d2259d
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/CarrierWifiTogglePreferenceController.java
View File

@@ -23,7 +23,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settings.wifi.WifiPickerTrackerHelper; import com.android.settings.wifi.WifiPickerTrackerHelper;
import com.android.wifitrackerlib.WifiPickerTracker; import com.android.wifitrackerlib.WifiPickerTracker;
@@ -65,7 +64,7 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr
@Override @Override
public boolean isChecked() { public boolean isChecked() {
return mWifiPickerTrackerHelper.isCarrierNetworkEnabled(mSubId); return mWifiPickerTrackerHelper.isCarrierNetworkEnabled();
} }
@Override @Override

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 */ /** Return the enabled/disabled state of the carrier network */
public boolean isCarrierNetworkEnabled(int subId) { public boolean isCarrierNetworkEnabled() {
return mWifiManager.isCarrierNetworkOffloadEnabled(subId, true /* merged */); 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 */ /** Enables/disables the carrier network */
public void setCarrierNetworkEnabled(boolean enabled) { public void setCarrierNetworkEnabled(boolean enabled) {
final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry(); final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
if (mergedCarrierEntry == null) { if (mergedCarrierEntry == null) {
Log.e(TAG, "Unable to get MergedCarrierEntry to set enabled status");
return; return;
} }
Log.i(TAG, "setCarrierNetworkEnabled:" + enabled);
mergedCarrierEntry.setEnabled(enabled); mergedCarrierEntry.setEnabled(enabled);
} }

4
tests/unit/src/com/android/settings/network/CarrierWifiTogglePreferenceControllerTest.java
View File

@@ -107,14 +107,14 @@ public class CarrierWifiTogglePreferenceControllerTest {
@Test @Test
public void isChecked_carrierNetworkEnabled_returnTrue() { public void isChecked_carrierNetworkEnabled_returnTrue() {
doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled(SUB_ID); doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled();
assertThat(mController.isChecked()).isEqualTo(true); assertThat(mController.isChecked()).isEqualTo(true);
} }
@Test @Test
public void isChecked_carrierNetworkDisabled_returnFalse() { public void isChecked_carrierNetworkDisabled_returnFalse() {
doReturn(false).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled(SUB_ID); doReturn(false).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled();
assertThat(mController.isChecked()).isEqualTo(false); assertThat(mController.isChecked()).isEqualTo(false);
} }

10
tests/unit/src/com/android/settings/wifi/WifiPickerTrackerHelperTest.java
View File

@@ -24,7 +24,6 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -135,14 +134,13 @@ public class WifiPickerTrackerHelperTest {
@Test @Test
public void isCarrierNetworkEnabled_returnCorrect() { public void isCarrierNetworkEnabled_returnCorrect() {
doReturn(true).when(mWifiManager).isCarrierNetworkOffloadEnabled(SUB_ID, true /* merged */); when(mMergedCarrierEntry.isEnabled()).thenReturn(true);
assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled(SUB_ID)).isTrue(); assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled()).isTrue();
doReturn(false).when(mWifiManager) when(mMergedCarrierEntry.isEnabled()).thenReturn(false);
.isCarrierNetworkOffloadEnabled(SUB_ID, true /* merged */);
assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled(SUB_ID)).isFalse(); assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled()).isFalse();
} }
@Test @Test