Merge "Check DISALLOW_CONFIG_MOBILE_NETWORKS when search" into main (7e364ed8) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/MobileNetworkListFragment.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ class MobileNetworkListFragment : DashboardFragment() {
		private val simRepositoryFactory: (Context) -> SimRepository = ::SimRepository
		) : BaseSearchIndexProvider(R.xml.network_provider_sims_list) {
		public override fun isPageSearchEnabled(context: Context): Boolean =
		simRepositoryFactory(context).showMobileNetworkPage()
		simRepositoryFactory(context).canEnterMobileNetworkPage()
		}
		}
		}

src/com/android/settings/network/MobileNetworkSummaryController.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ constructor(
		private var isAirplaneModeOn = false

		override fun getAvailabilityStatus() =
		if (SimRepository(mContext).showMobileNetworkPage()) AVAILABLE
		if (SimRepository(mContext).showMobileNetworkPageEntrance()) AVAILABLE
		else CONDITIONALLY_UNAVAILABLE

		override fun displayPreference(screen: PreferenceScreen) {

src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ constructor(

		override fun getSummary(): CharSequence {
		val summaryResId =
		if (simRepository.showMobileNetworkPage()) {
		if (simRepository.showMobileNetworkPageEntrance()) {
		R.string.network_dashboard_summary_mobile
		} else {
		R.string.network_dashboard_summary_no_mobile

src/com/android/settings/network/telephony/MobileNetworkSettingsSearchIndex.kt

+2 −8

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.provider.Settings
		import android.telephony.SubscriptionInfo
		import com.android.settings.R
		import com.android.settings.datausage.BillingCyclePreferenceController.Companion.BillingCycleSearchItem
		import com.android.settings.network.SubscriptionUtil
		import com.android.settings.network.telephony.CarrierSettingsVersionPreferenceController.Companion.CarrierSettingsVersionSearchItem
		import com.android.settings.network.telephony.DataUsagePreferenceController.Companion.DataUsageSearchItem
		import com.android.settings.network.telephony.MmsMessagePreferenceController.Companion.MmsMessageSearchItem
		@@ -36,7 +35,6 @@ import com.android.settings.spa.search.SpaSearchRepository.Companion.createSearc
		import com.android.settings.spa.search.SpaSearchRepository.Companion.searchIndexProviderOf
		import com.android.settingslib.search.SearchIndexableData
		import com.android.settingslib.search.SearchIndexableRaw
		import com.android.settingslib.spaprivileged.framework.common.userManager
		import com.android.settingslib.spaprivileged.settingsprovider.settingsGlobalBoolean

		class MobileNetworkSettingsSearchIndex(
		@@ -109,12 +107,8 @@ class MobileNetworkSettingsSearchIndex(
		companion object {
		/** suppress full page if user is not admin */
		@JvmStatic
		fun isMobileNetworkSettingsSearchable(context: Context): Boolean {
		val isAirplaneMode by context.settingsGlobalBoolean(Settings.Global.AIRPLANE_MODE_ON)
		return SubscriptionUtil.isSimHardwareVisible(context) &&
		!isAirplaneMode &&
		context.userManager.isAdminUser
		}
		fun isMobileNetworkSettingsSearchable(context: Context): Boolean =
		SimRepository(context).canEnterMobileNetworkPage()

		fun createSearchItems(context: Context): List<MobileNetworkSettingsSearchItem> =
		listOf(

src/com/android/settings/network/telephony/SimRepository.kt

+14 −3

Original line number	Diff line number	Diff line
		@@ -18,13 +18,24 @@ package com.android.settings.network.telephony

		import android.content.Context
		import android.content.pm.PackageManager
		import android.os.UserManager
		import android.provider.Settings
		import com.android.settingslib.spaprivileged.framework.common.userManager
		import com.android.settingslib.spaprivileged.settingsprovider.settingsGlobalBoolean

		class SimRepository(context: Context) {
		class SimRepository(private val context: Context) {
		private val packageManager = context.packageManager
		private val userManager = context.userManager

		/** Gets whether we show mobile network settings page to the current user. */
		fun showMobileNetworkPage(): Boolean =
		/** Gets whether show mobile network settings page entrance to the current user. */
		fun showMobileNetworkPageEntrance(): Boolean =
		packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) && userManager.isAdminUser

		/** Gets whether current user can enter mobile network settings page. */
		fun canEnterMobileNetworkPage(): Boolean {
		val isAirplaneMode by context.settingsGlobalBoolean(Settings.Global.AIRPLANE_MODE_ON)
		return showMobileNetworkPageEntrance() &&
		!isAirplaneMode &&
		!userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)
		}
		}