commit 3eff731e525161a70aeca85197f49db140462e58
author Yuri Ufimtsev <yufimtsev@google.com> Fri Dec 20 14:46:53 2024 +0000
committer Yuri Ufimtsev <yufimtsev@google.com> Fri Jan 03 15:48:27 2025 +0000
tree 6d732a44e8d13fb806abc36c7b6e8f0b9a11732d
parent 1d0c7054b45efd4923353f6bac9b8a163213d8b4

Allow to open Content Protection settings externally

Test: adb root && adb shell aflags enable android.view.contentprotection.flags.exported_settings_activity_enabled && adb reboot && sleep 60 && adb shell am start -a android.settings.CONTENT_PROTECTION_SETTINGS
Bug: 385310040
Flag: android.view.contentprotection.flags.exported_settings_activity_enabled
Change-Id: I1a5e33196051de88ceaddb638edab702f762fe5d

Android.bp

diff --git a/Android.bp b/Android.bp
index 0a633ac..0142846 100644
--- a/Android.bp
+++ b/Android.bp
@@ -139,6 +139,7 @@
         "android.app.flags-aconfig",
         "android.provider.flags-aconfig",
         "android.security.flags-aconfig",
+        "android.view.contentprotection.flags-aconfig",
         "keyboard_flags",
     ],
 }

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a673920..f172795 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5531,6 +5531,21 @@
                        android:value="true" />
         </activity>
 
+
+        <activity android:name=".Settings$ContentProtectionSettingsActivity"
+            android:label="@string/content_protection_preference_title"
+            android:exported="true"
+            android:featureFlag="android.view.contentprotection.flags.exported_settings_activity_enabled">
+            <intent-filter>
+                <action android:name="android.settings.CONTENT_PROTECTION_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.security.ContentProtectionPreferenceFragment"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_system"/>
+        </activity>
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index e373ccc..91494af 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -528,4 +528,5 @@
     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 */ }
 }

src/com/android/settings/core/gateway/SettingsGateway.java

diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index bc2ab68..81dc3ad 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.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 @@
             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 = {