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

[Catalyst] Add restriction for SIMs and Tethering

Browse Source 
Bug: 377600992
Flag: com.android.settings.flags.catalyst
Test: testdpc
Change-Id: I098e49e5aad30711eedfea38361e42584b80c31b
This commit is contained in:
Jacky Wang
2024-11-08 04:11:37 +08:00
parent 02753a7e29
commit d824a682b2
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/network/MobileNetworkListScreen.kt
View File

@@ -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<PreferenceRestrictionMixin>.isEnabled(context)
override val restrictionKey: String
get() = UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS
override fun isFlagEnabled(context: Context) = Flags.catalystMobileNetworkList()
override fun hasCompleteHierarchy() = false

10
src/com/android/settings/network/tether/TetherScreen.kt
View File

@@ -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<PreferenceRestrictionMixin>.isEnabled(context)
override val restrictionKey: String
get() = UserManager.DISALLOW_CONFIG_TETHERING
override fun isFlagEnabled(context: Context) = Flags.catalystTetherSettings()
override fun hasCompleteHierarchy() = false