From 375679e5aa9b699d31a161a96b587e6e4eb7db28 Mon Sep 17 00:00:00 2001
From: Yuri Ufimtsev <yufimtsev@google.com>
Date: Fri, 28 Feb 2025 16:32:18 +0000
Subject: [PATCH] Add Content Protection settings to Advanced Security page

That simplifies OEM integration when SafetyCenter is disabled.
Entrypoints are kept in both SafetyCenter-specific `more_security_privacy_settings`
and `security_advanced_settings` as these pages are mutually exclusive.

Bug: 399869618
Test: manual - took a photo
Change-Id: Ie1280fd53b46191763d820a186c769414d82629e
---
 res/xml/security_advanced_settings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/res/xml/security_advanced_settings.xml b/res/xml/security_advanced_settings.xml
index f1556d61901..d2d88f11854 100644
--- a/res/xml/security_advanced_settings.xml
+++ b/res/xml/security_advanced_settings.xml
@@ -30,6 +30,15 @@
         android:key="security_category"
         android:layout="@layout/preference_category_no_label" />
 
+    <Preference
+        android:order="230"
+        android:key="content_protection_preference"
+        android:title="@string/content_protection_preference_title"
+        android:summary="@string/content_protection_preference_summary"
+        android:fragment="com.android.settings.security.ContentProtectionPreferenceFragment"
+        settings:keywords="@string/content_protection_preference_title"
+        settings:controller="com.android.settings.security.ContentProtectionPreferenceController" />
+
     <PreferenceCategory
         android:order="240"
         android:key="security_settings_device_admin_category"