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

Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c am: a1a5091f12 am: 3fb5213538 am: 973031b290

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

Change-Id: I459260827839a534dfb749bd967e23fd70054c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-04-01 07:57:15 +00:00
committed by Automerger Merge Worker
parent 37164a1af7 973031b290
commit 537cf057b2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/InternetResetHelper.java
View File

@@ -205,7 +205,7 @@ public class InternetResetHelper implements LifecycleObserver,
protected void resumePreferences() { protected void resumePreferences() {
if (mIsRecoveryReady && mMobileNetworkController != null) { if (mIsRecoveryReady && mMobileNetworkController != null) {
Log.d(TAG, "Resume the Mobile Network controller"); Log.d(TAG, "Resume the Mobile Network controller");
mMobileNetworkController.hidePreference(false /* hide */, false /* immediately */); mMobileNetworkController.hidePreference(false /* hide */, true /* immediately */);
} }
if (mIsWifiReady && mWifiTogglePreferences != null) { if (mIsWifiReady && mWifiTogglePreferences != null) {
Log.d(TAG, "Resume the Wi-Fi preferences"); Log.d(TAG, "Resume the Wi-Fi preferences");

6
tests/unit/src/com/android/settings/network/InternetResetHelperTest.java
View File

@@ -220,7 +220,7 @@ public class InternetResetHelperTest {
// Show resetting preference // Show resetting preference
assertThat(mResettingPreference.isVisible()).isTrue(); assertThat(mResettingPreference.isVisible()).isTrue();
// Show Mobile Network controller // Show Mobile Network controller
verify(mMobileNetworkController).hidePreference(false /* hide */, false /* immediately*/); verify(mMobileNetworkController).hidePreference(false /* hide */, true /* immediately*/);
// Hide Wi-Fi preferences // Hide Wi-Fi preferences
assertThat(mWifiTogglePreferences.isVisible()).isFalse(); assertThat(mWifiTogglePreferences.isVisible()).isFalse();
assertThat(mConnectedWifiEntryPreferences.isVisible()).isFalse(); assertThat(mConnectedWifiEntryPreferences.isVisible()).isFalse();
@@ -243,7 +243,7 @@ public class InternetResetHelperTest {
assertThat(mWifiEntryPreferences.isVisible()).isTrue(); assertThat(mWifiEntryPreferences.isVisible()).isTrue();
// Hide Mobile Network controller // Hide Mobile Network controller
verify(mMobileNetworkController, never()) verify(mMobileNetworkController, never())
.hidePreference(false /* hide */, false /* immediately*/); .hidePreference(false /* hide */, true /* immediately*/);
} }
@Test @Test
@@ -254,7 +254,7 @@ public class InternetResetHelperTest {
mInternetResetHelper.resumePreferences(); mInternetResetHelper.resumePreferences();
// Show subsystem preferences // Show subsystem preferences
verify(mMobileNetworkController).hidePreference(false, false); verify(mMobileNetworkController).hidePreference(false, true);
assertThat(mWifiTogglePreferences.isVisible()).isTrue(); assertThat(mWifiTogglePreferences.isVisible()).isTrue();
assertThat(mConnectedWifiEntryPreferences.isVisible()).isTrue(); assertThat(mConnectedWifiEntryPreferences.isVisible()).isTrue();
assertThat(mWifiEntryPreferences.isVisible()).isTrue(); assertThat(mWifiEntryPreferences.isVisible()).isTrue();