diff --git a/src/com/android/settings/network/MobileNetworkListScreen.kt b/src/com/android/settings/network/MobileNetworkListScreen.kt index 93d8ee671d1..51c068bfbb3 100644 --- a/src/com/android/settings/network/MobileNetworkListScreen.kt +++ b/src/com/android/settings/network/MobileNetworkListScreen.kt @@ -16,6 +16,8 @@ package com.android.settings.network import android.content.Context +import android.os.UserManager +import com.android.settings.PreferenceRestrictionMixin import com.android.settings.R import com.android.settings.flags.Flags import com.android.settingslib.metadata.ProvidePreferenceScreen @@ -23,7 +25,7 @@ import com.android.settingslib.metadata.preferenceHierarchy import com.android.settingslib.preference.PreferenceScreenCreator @ProvidePreferenceScreen -class MobileNetworkListScreen : PreferenceScreenCreator { +class MobileNetworkListScreen : PreferenceScreenCreator, PreferenceRestrictionMixin { override val key: String get() = KEY @@ -36,6 +38,11 @@ class MobileNetworkListScreen : PreferenceScreenCreator { override val keywords: Int get() = R.string.keywords_more_mobile_networks + override fun isEnabled(context: Context) = super.isEnabled(context) + + override val restrictionKey: String + get() = UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS + override fun isFlagEnabled(context: Context) = Flags.catalystMobileNetworkList() override fun hasCompleteHierarchy() = false diff --git a/src/com/android/settings/network/tether/TetherScreen.kt b/src/com/android/settings/network/tether/TetherScreen.kt index 20dc4b704fc..542fd5f743c 100644 --- a/src/com/android/settings/network/tether/TetherScreen.kt +++ b/src/com/android/settings/network/tether/TetherScreen.kt @@ -17,6 +17,8 @@ package com.android.settings.network.tether import android.content.Context import android.net.TetheringManager +import android.os.UserManager +import com.android.settings.PreferenceRestrictionMixin import com.android.settings.R import com.android.settings.flags.Flags import com.android.settings.network.TetherPreferenceController @@ -28,7 +30,8 @@ import com.android.settingslib.metadata.preferenceHierarchy import com.android.settingslib.preference.PreferenceScreenCreator @ProvidePreferenceScreen -class TetherScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider { +class TetherScreen : + PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceRestrictionMixin { override val key: String get() = KEY @@ -49,6 +52,11 @@ class TetherScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider { override fun isAvailable(context: Context) = TetherUtil.isTetherAvailable(context) + override fun isEnabled(context: Context) = super.isEnabled(context) + + override val restrictionKey: String + get() = UserManager.DISALLOW_CONFIG_TETHERING + override fun isFlagEnabled(context: Context) = Flags.catalystTetherSettings() override fun hasCompleteHierarchy() = false