From 5710b0297211fcb79079074ba3f18d913b3fd6e2 Mon Sep 17 00:00:00 2001
From: hoffc <quic_hoffc@quicinc.com>
Date: Mon, 21 Mar 2022 16:20:12 +0800
Subject: [PATCH] Settings: Fix cellular internet option Not seen after
 internet reset

Cellular internet preference will be hidden during reset internet, and resume to be visible after successfully reset or reset timeout. Due to the wrong immediately param value assigned for hidePreference method, which results in cellular internet preference not seen after internet reset.

Assign correct immediately param value when resuming after internet reset.

Bug: 224893326
Test: manual test
atest InternetResetHelperTest

Change-Id: I3f8d5dd9de2a56ecfe201483ee8a95b379e8fe65
---
 src/com/android/settings/network/InternetResetHelper.java   | 2 +-
 .../android/settings/network/InternetResetHelperTest.java   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/network/InternetResetHelper.java b/src/com/android/settings/network/InternetResetHelper.java
index d6c5476aaf0..253cf566401 100644
--- a/src/com/android/settings/network/InternetResetHelper.java
+++ b/src/com/android/settings/network/InternetResetHelper.java
@@ -204,7 +204,7 @@ public class InternetResetHelper implements LifecycleObserver,
     protected void resumePreferences() {
         if (mIsRecoveryReady && mMobileNetworkController != null) {
             Log.d(TAG, "Resume the Mobile Network controller");
-            mMobileNetworkController.hidePreference(false /* hide */, false /* immediately */);
+            mMobileNetworkController.hidePreference(false /* hide */, true /* immediately */);
         }
         if (mIsWifiReady && mWifiTogglePreferences != null) {
             Log.d(TAG, "Resume the Wi-Fi preferences");
diff --git a/tests/unit/src/com/android/settings/network/InternetResetHelperTest.java b/tests/unit/src/com/android/settings/network/InternetResetHelperTest.java
index 00ca8e18c69..3dbaa919fd8 100644
--- a/tests/unit/src/com/android/settings/network/InternetResetHelperTest.java
+++ b/tests/unit/src/com/android/settings/network/InternetResetHelperTest.java
@@ -217,7 +217,7 @@ public class InternetResetHelperTest {
         // Show resetting preference
         assertThat(mResettingPreference.isVisible()).isTrue();
         // Show Mobile Network controller
-        verify(mMobileNetworkController).hidePreference(false /* hide */, false /* immediately*/);
+        verify(mMobileNetworkController).hidePreference(false /* hide */, true /* immediately*/);
         // Hide Wi-Fi preferences
         assertThat(mWifiTogglePreferences.isVisible()).isFalse();
         assertThat(mConnectedWifiEntryPreferences.isVisible()).isFalse();
@@ -240,7 +240,7 @@ public class InternetResetHelperTest {
         assertThat(mWifiEntryPreferences.isVisible()).isTrue();
         // Hide Mobile Network controller
         verify(mMobileNetworkController, never())
-                .hidePreference(false /* hide */, false /* immediately*/);
+                .hidePreference(false /* hide */, true /* immediately*/);
     }
 
     @Test
@@ -251,7 +251,7 @@ public class InternetResetHelperTest {
         mInternetResetHelper.resumePreferences();
 
         // Show subsystem preferences
-        verify(mMobileNetworkController).hidePreference(false, false);
+        verify(mMobileNetworkController).hidePreference(false, true);
         assertThat(mWifiTogglePreferences.isVisible()).isTrue();
         assertThat(mConnectedWifiEntryPreferences.isVisible()).isTrue();
         assertThat(mWifiEntryPreferences.isVisible()).isTrue();