Onboard content protection flags
Bug: 301658008
Test: Manual with a test flag
Change-Id: I0d58859f3a7f6b48045a868b728c79610e19225b
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index ab20edc..95b6155 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -39,6 +39,7 @@
":android.multiuser.flags-aconfig-java{.generated_srcjars}",
":android.app.flags-aconfig-java{.generated_srcjars}",
":android.credentials.flags-aconfig-java{.generated_srcjars}",
+ ":android.view.contentprotection.flags-aconfig-java{.generated_srcjars}",
]
filegroup {
@@ -369,3 +370,16 @@
aconfig_declarations: "android.credentials.flags-aconfig",
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+
+// Content Protection
+aconfig_declarations {
+ name: "android.view.contentprotection.flags-aconfig",
+ package: "android.view.contentprotection.flags",
+ srcs: ["core/java/android/view/contentprotection/flags/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.view.contentprotection.flags-aconfig-java",
+ aconfig_declarations: "android.view.contentprotection.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
diff --git a/core/java/android/view/contentprotection/flags/content_protection_flags.aconfig b/core/java/android/view/contentprotection/flags/content_protection_flags.aconfig
new file mode 100644
index 0000000..7e06f87
--- /dev/null
+++ b/core/java/android/view/contentprotection/flags/content_protection_flags.aconfig
@@ -0,0 +1,8 @@
+package: "android.view.contentprotection.flags"
+
+flag {
+ name: "blocklist_update_enabled"
+ namespace: "content_protection"
+ description: "If true, content protection blocklist is mutable and can be updated."
+ bug: "301658008"
+}