From d75bd5298244b63f7f8a7fe0c071c5872a0e09de Mon Sep 17 00:00:00 2001 From: tom hsu Date: Fri, 26 May 2023 13:39:18 +0800 Subject: [PATCH] [Settings] After APM on, do not show the page result in Settings search Bug: 249520846 Test: Manual test Change-Id: I51df50f244649a406449449a0b2d39164ad5e218 --- .../settings/network/telephony/MobileNetworkSettings.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index 83d2117af1b..d6d9df4a992 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -52,7 +52,6 @@ import com.android.settings.wifi.WifiPickerTrackerHelper; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity; import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; -import com.android.settingslib.mobile.dataservice.UiccInfoEntity; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.utils.ThreadUtils; @@ -441,8 +440,10 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme /** suppress full page if user is not admin */ @Override protected boolean isPageSearchEnabled(Context context) { - return SubscriptionUtil.isSimHardwareVisible(context) && - context.getSystemService(UserManager.class).isAdminUser(); + boolean isAirplaneOff = Settings.Global.getInt(context.getContentResolver(), + Settings.Global.AIRPLANE_MODE_ON, 0) == 0; + return isAirplaneOff && SubscriptionUtil.isSimHardwareVisible(context) + && context.getSystemService(UserManager.class).isAdminUser(); } };