diff --git a/Android.bp b/Android.bp index ddd4f7ab8db..c966eca2e92 100644 --- a/Android.bp +++ b/Android.bp @@ -140,6 +140,7 @@ android_library { "android.app.flags-aconfig", "android.provider.flags-aconfig", "android.security.flags-aconfig", + "android.view.contentprotection.flags-aconfig", "keyboard_flags", ], } diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4a59333e164..bce30dc7068 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -5556,6 +5556,21 @@ android:value="true" /> + + + + + + + + + + diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index e373ccccd1d..91494af29c6 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -528,4 +528,5 @@ public class Settings extends SettingsActivity { public static class HearingDevicesActivity extends SettingsActivity { /* empty */ } public static class HearingDevicesPairingActivity extends SettingsActivity { /* empty */ } public static class ContactsStorageSettingsActivity extends SettingsActivity { /* empty */ } + public static class ContentProtectionSettingsActivity extends SettingsActivity { /* empty */ } } diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java index bc2ab68764c..81dc3ad3837 100644 --- a/src/com/android/settings/core/gateway/SettingsGateway.java +++ b/src/com/android/settings/core/gateway/SettingsGateway.java @@ -189,6 +189,7 @@ import com.android.settings.regionalpreferences.RegionPickerFragment; import com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment; import com.android.settings.regionalpreferences.TemperatureUnitFragment; import com.android.settings.safetycenter.MoreSecurityPrivacyFragment; +import com.android.settings.security.ContentProtectionPreferenceFragment; import com.android.settings.security.LockscreenDashboardFragment; import com.android.settings.security.MemtagPage; import com.android.settings.security.SecurityAdvancedSettings; @@ -415,7 +416,8 @@ public class SettingsGateway { HearingDevicePairingFragment.class.getName(), ZenModesListFragment.class.getName(), ZenModeFragment.class.getName(), - ContactsStorageSettings.class.getName() + ContactsStorageSettings.class.getName(), + ContentProtectionPreferenceFragment.class.getName(), }; public static final String[] SETTINGS_FOR_RESTRICTED = {