From 02753a7e2997d58a4dea0b9bc6c6760020ab4997 Mon Sep 17 00:00:00 2001 From: Jacky Wang Date: Fri, 8 Nov 2024 04:09:05 +0800 Subject: [PATCH] [Catalyst] Add restriction for Internet Also add the missing settings:userRestriction in xml. Bug: 377600992 Flag: com.android.settings.flags.catalyst Test: testdpc Change-Id: I179dbba19867d864ec2df5989857083511777514 --- res/xml/network_provider_internet.xml | 1 + .../android/settings/network/NetworkProviderScreen.kt | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml index 1437db67da5..1d1bf16dbb0 100644 --- a/res/xml/network_provider_internet.xml +++ b/res/xml/network_provider_internet.xml @@ -30,6 +30,7 @@ settings:allowDividerAbove="true" settings:keywords="@string/keywords_internet" settings:useAdminDisabledSummary="true" + settings:userRestriction="no_config_wifi" settings:controller="com.android.settings.network.InternetPreferenceControllerV2" /> .isEnabled(context) + + override val restrictionKey: String + get() = UserManager.DISALLOW_CONFIG_WIFI + override fun isFlagEnabled(context: Context) = Flags.catalystInternetSettings() override fun hasCompleteHierarchy() = false