Merge "Ui show "No connection" when WiFi is turned on and no available network" into sc-dev

This commit is contained in:
SongFerng Wang
2021-04-28 07:18:01 +00:00
committed by Android (Google) Code Review
4 changed files with 153 additions and 143 deletions

View File

@@ -218,38 +218,6 @@ public class ProviderModelSliceHelperTest {
assertThat(testRowBuild.getSubtitle()).isEqualTo(expectedSubtitle);
}
@Test
public void isNoCarrierData_mobileDataOnAndNoData_returnTrue() {
mockConnections(true, ServiceState.STATE_IN_SERVICE, "",
mTelephonyManager.DATA_DISCONNECTED, true);
assertThat(mProviderModelSliceHelper.isNoCarrierData()).isTrue();
}
@Test
public void isNoCarrierData_mobileDataOffAndOutOfService_returnTrue() {
mockConnections(false, ServiceState.STATE_OUT_OF_SERVICE, "",
mTelephonyManager.DATA_DISCONNECTED, true);
assertThat(mProviderModelSliceHelper.isNoCarrierData()).isTrue();
}
@Test
public void isNoCarrierData_mobileDataOnAndDataConnected_returnFalse() {
mockConnections(true, ServiceState.STATE_IN_SERVICE, "", mTelephonyManager.DATA_CONNECTED,
true);
assertThat(mProviderModelSliceHelper.isNoCarrierData()).isFalse();
}
@Test
public void isNoCarrierData_mobileDataOffAndVoiceIsInService_returnFalse() {
mockConnections(false, ServiceState.STATE_IN_SERVICE, "",
mTelephonyManager.DATA_DISCONNECTED, true);
assertThat(mProviderModelSliceHelper.isNoCarrierData()).isFalse();
}
@Test
public void getMobileDrawable_noCarrierData_getMobileDrawable() throws Throwable {
mockConnections(false, ServiceState.STATE_OUT_OF_SERVICE, "",