[Catalyst] Add restriction for SIMs and Tethering
Bug: 377600992 Flag: com.android.settings.flags.catalyst Test: testdpc Change-Id: I098e49e5aad30711eedfea38361e42584b80c31b
This commit is contained in:
@@ -16,6 +16,8 @@
|
|||||||
package com.android.settings.network
|
package com.android.settings.network
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import android.os.UserManager
|
||||||
|
import com.android.settings.PreferenceRestrictionMixin
|
||||||
import com.android.settings.R
|
import com.android.settings.R
|
||||||
import com.android.settings.flags.Flags
|
import com.android.settings.flags.Flags
|
||||||
import com.android.settingslib.metadata.ProvidePreferenceScreen
|
import com.android.settingslib.metadata.ProvidePreferenceScreen
|
||||||
@@ -23,7 +25,7 @@ import com.android.settingslib.metadata.preferenceHierarchy
|
|||||||
import com.android.settingslib.preference.PreferenceScreenCreator
|
import com.android.settingslib.preference.PreferenceScreenCreator
|
||||||
|
|
||||||
@ProvidePreferenceScreen
|
@ProvidePreferenceScreen
|
||||||
class MobileNetworkListScreen : PreferenceScreenCreator {
|
class MobileNetworkListScreen : PreferenceScreenCreator, PreferenceRestrictionMixin {
|
||||||
override val key: String
|
override val key: String
|
||||||
get() = KEY
|
get() = KEY
|
||||||
|
|
||||||
@@ -36,6 +38,11 @@ class MobileNetworkListScreen : PreferenceScreenCreator {
|
|||||||
override val keywords: Int
|
override val keywords: Int
|
||||||
get() = R.string.keywords_more_mobile_networks
|
get() = R.string.keywords_more_mobile_networks
|
||||||
|
|
||||||
|
override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
|
||||||
|
|
||||||
|
override val restrictionKey: String
|
||||||
|
get() = UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS
|
||||||
|
|
||||||
override fun isFlagEnabled(context: Context) = Flags.catalystMobileNetworkList()
|
override fun isFlagEnabled(context: Context) = Flags.catalystMobileNetworkList()
|
||||||
|
|
||||||
override fun hasCompleteHierarchy() = false
|
override fun hasCompleteHierarchy() = false
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ package com.android.settings.network.tether
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.net.TetheringManager
|
import android.net.TetheringManager
|
||||||
|
import android.os.UserManager
|
||||||
|
import com.android.settings.PreferenceRestrictionMixin
|
||||||
import com.android.settings.R
|
import com.android.settings.R
|
||||||
import com.android.settings.flags.Flags
|
import com.android.settings.flags.Flags
|
||||||
import com.android.settings.network.TetherPreferenceController
|
import com.android.settings.network.TetherPreferenceController
|
||||||
@@ -28,7 +30,8 @@ import com.android.settingslib.metadata.preferenceHierarchy
|
|||||||
import com.android.settingslib.preference.PreferenceScreenCreator
|
import com.android.settingslib.preference.PreferenceScreenCreator
|
||||||
|
|
||||||
@ProvidePreferenceScreen
|
@ProvidePreferenceScreen
|
||||||
class TetherScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
|
class TetherScreen :
|
||||||
|
PreferenceScreenCreator, PreferenceAvailabilityProvider, PreferenceRestrictionMixin {
|
||||||
|
|
||||||
override val key: String
|
override val key: String
|
||||||
get() = KEY
|
get() = KEY
|
||||||
@@ -49,6 +52,11 @@ class TetherScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {
|
|||||||
|
|
||||||
override fun isAvailable(context: Context) = TetherUtil.isTetherAvailable(context)
|
override fun isAvailable(context: Context) = TetherUtil.isTetherAvailable(context)
|
||||||
|
|
||||||
|
override fun isEnabled(context: Context) = super<PreferenceRestrictionMixin>.isEnabled(context)
|
||||||
|
|
||||||
|
override val restrictionKey: String
|
||||||
|
get() = UserManager.DISALLOW_CONFIG_TETHERING
|
||||||
|
|
||||||
override fun isFlagEnabled(context: Context) = Flags.catalystTetherSettings()
|
override fun isFlagEnabled(context: Context) = Flags.catalystTetherSettings()
|
||||||
|
|
||||||
override fun hasCompleteHierarchy() = false
|
override fun hasCompleteHierarchy() = false
|
||||||
|
|||||||
Reference in New Issue
Block a user