commit d3b41aa9054f1f696127d9cbf2613ad44140cfbb
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 26 06:53:16 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 26 06:53:16 2023 +0000
tree 484bcca608f6f6511ad3b2773b9bf93283182522
parent 52d2daf3b36f26dfa7ebabd04472aa8022655a21
parent d75bd5298244b63f7f8a7fe0c071c5872a0e09de

Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev

src/com/android/settings/network/telephony/MobileNetworkSettings.java

diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 83d2117..d6d9df4 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.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 @@
                 /** 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();
                 }
             };