Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62492270 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Settings] After APM on, do not show the page result in Settings... 

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

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



Change-Id: I910a6b2976d8a5beeb5c2131a667446090ccc445
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89b497a0 d3b41aa9

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

+4 −3
Original line number Diff line number Diff line
@@ -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();

                }

            };