From af43d953322968a0d21964121c4f27593f8c8641 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Mon, 11 Mar 2024 12:27:06 +0800 Subject: [PATCH] Restrict SimPreference Check policy UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS. Bug: 329000499 Test: manual - on Mobile Settings Change-Id: I37687299a9ec5c77b59cb231969180872271f4a6 --- src/com/android/settings/spa/network/SimsSection.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/spa/network/SimsSection.kt b/src/com/android/settings/spa/network/SimsSection.kt index 334ca61bc9b..9e4cf9f4c12 100644 --- a/src/com/android/settings/spa/network/SimsSection.kt +++ b/src/com/android/settings/spa/network/SimsSection.kt @@ -36,10 +36,10 @@ import com.android.settings.network.telephony.isSubscriptionEnabledFlow import com.android.settings.network.telephony.phoneNumberFlow import com.android.settingslib.spa.widget.preference.PreferenceModel import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel -import com.android.settingslib.spa.widget.preference.TwoTargetSwitchPreference import com.android.settingslib.spa.widget.ui.SettingsIcon import com.android.settingslib.spaprivileged.model.enterprise.Restrictions import com.android.settingslib.spaprivileged.template.preference.RestrictedPreference +import com.android.settingslib.spaprivileged.template.preference.RestrictedTwoTargetSwitchPreference @Composable fun SimsSection(subscriptionInfoList: List) { @@ -61,9 +61,8 @@ private fun SimPreference(subInfo: SubscriptionInfo) { val phoneNumber = remember(subInfo) { context.phoneNumberFlow(subInfo) }.collectAsStateWithLifecycle(initialValue = null) - //TODO: Add the Restricted TwoTargetSwitchPreference in SPA - TwoTargetSwitchPreference( - object : SwitchPreferenceModel { + RestrictedTwoTargetSwitchPreference( + model = object : SwitchPreferenceModel { override val title = subInfo.displayName.toString() override val summary = { phoneNumber.value ?: "" } override val checked = { checked.value } @@ -74,7 +73,8 @@ private fun SimPreference(subInfo: SubscriptionInfo) { newChecked, ) } - } + }, + restrictions = Restrictions(keys = listOf(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)), ) { MobileNetworkUtils.launchMobileNetworkSettings(context, subInfo) }