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

Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce am: 2a56929f62

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

Change-Id: I4e76656f5cfefe4dca6a432929e9c8ac756c34db
This commit is contained in:
TreeHugger Robot
2021-06-29 13:39:21 +00:00
committed by Automerger Merge Worker
parent 49ab6f7ba5 2a56929f62
commit 1d69f1c0e1
6 changed files with 609 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
View File

@@ -67,7 +67,6 @@ import com.android.settings.wifi.ConnectedWifiEntryPreference;
import com.android.settings.wifi.LongPressWifiEntryPreference;
import com.android.settings.wifi.WifiConfigController2;
import com.android.settings.wifi.WifiDialog2;
import com.android.settingslib.connectivity.ConnectivitySubsystemsRecoveryManager;
import com.android.settingslib.widget.LayoutPreference;
import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiPickerTracker;
@@ -105,7 +104,7 @@ public class NetworkProviderSettingsTest {
@Mock
private PreferenceManager mPreferenceManager;
@Mock
private ConnectivitySubsystemsRecoveryManager mConnectivitySubsystemsRecoveryManager;
private InternetResetHelper mInternetResetHelper;
@Mock
private Preference mAirplaneModeMsgPreference;
@Mock
@@ -439,49 +438,14 @@ public class NetworkProviderSettingsTest {
}
@Test
public void onOptionsItemSelected_fixConnectivity_triggerSubsystemRestart() {
doReturn(true).when(mConnectivitySubsystemsRecoveryManager).isRecoveryAvailable();
mNetworkProviderSettings.mConnectivitySubsystemsRecoveryManager =
mConnectivitySubsystemsRecoveryManager;
public void onOptionsItemSelected_fixConnectivity_restartInternet() {
mNetworkProviderSettings.mInternetResetHelper = mInternetResetHelper;
doReturn(false).when(mNetworkProviderSettings).isPhoneOnCall();
doReturn(NetworkProviderSettings.MENU_FIX_CONNECTIVITY).when(mMenuItem).getItemId();
mNetworkProviderSettings.onOptionsItemSelected(mMenuItem);
verify(mConnectivitySubsystemsRecoveryManager).triggerSubsystemRestart(any(), any());
}
@Test
public void onOptionsItemSelected_fixConnectivityOnCall_neverTriggerSubsystemRestart() {
doReturn(true).when(mConnectivitySubsystemsRecoveryManager).isRecoveryAvailable();
mNetworkProviderSettings.mConnectivitySubsystemsRecoveryManager =
mConnectivitySubsystemsRecoveryManager;
doReturn(true).when(mNetworkProviderSettings).isPhoneOnCall();
doNothing().when(mNetworkProviderSettings).showResetInternetDialog();
doReturn(NetworkProviderSettings.MENU_FIX_CONNECTIVITY).when(mMenuItem).getItemId();
mNetworkProviderSettings.onOptionsItemSelected(mMenuItem);
verify(mConnectivitySubsystemsRecoveryManager, never()).triggerSubsystemRestart(any(),
any());
}
@Test
public void onSubsystemRestartOperationBegin_showResetInternetHideApmMsg() {
mNetworkProviderSettings.onSubsystemRestartOperationBegin();
verify(mResetInternetPreference).setVisible(true);
verify(mAirplaneModeMsgPreference).setVisible(false);
}
@Test
public void onSubsystemRestartOperationEnd_showApmMsgHideResetInternet() {
doReturn(true).when(mAirplaneModeEnabler).isAirplaneModeOn();
mNetworkProviderSettings.onSubsystemRestartOperationEnd();
verify(mResetInternetPreference).setVisible(false);
verify(mAirplaneModeMsgPreference).setVisible(true);
verify(mInternetResetHelper).restart();
}
@Test