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

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

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-26 06:53:16 +00:00
committed by Android (Google) Code Review
parent 52d2daf3b3 d75bd52982
commit d3b41aa905
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -52,7 +52,6 @@ import com.android.settings.wifi.WifiPickerTrackerHelper;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity; import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity;
import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;
import com.android.settingslib.mobile.dataservice.UiccInfoEntity;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.utils.ThreadUtils; import com.android.settingslib.utils.ThreadUtils;
@@ -441,8 +440,10 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
/** suppress full page if user is not admin */ /** suppress full page if user is not admin */
@Override @Override
protected boolean isPageSearchEnabled(Context context) { protected boolean isPageSearchEnabled(Context context) {
return SubscriptionUtil.isSimHardwareVisible(context) && boolean isAirplaneOff = Settings.Global.getInt(context.getContentResolver(),
context.getSystemService(UserManager.class).isAdminUser(); Settings.Global.AIRPLANE_MODE_ON, 0) == 0;
return isAirplaneOff && SubscriptionUtil.isSimHardwareVisible(context)
&& context.getSystemService(UserManager.class).isAdminUser();
} }
}; };