Merge "Onboard content protection flags" into main (92427018) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+14 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ aconfig_srcjars = [
		":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 @@ java_aconfig_library {
		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"],
		}

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		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"
		}