Merge "Allow VDM flags to be used in PermissionController" into main (a3c982cc) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+13 −0

Original line number	Diff line number	Diff line
		@@ -438,9 +438,22 @@ aconfig_declarations {
		name: "android.companion.virtualdevice.flags-aconfig",
		package: "android.companion.virtualdevice.flags",
		container: "system",
		exportable: true,
		srcs: ["core/java/android/companion/virtual/flags/*.aconfig"],
		}

		java_aconfig_library {
		name: "android.companion.virtualdevice.flags-aconfig-java-export",
		aconfig_declarations: "android.companion.virtualdevice.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		mode: "exported",
		min_sdk_version: "30",
		apex_available: [
		"//apex_available:platform",
		"com.android.permission",
		],
		}

		java_aconfig_library {
		name: "android.companion.virtual.flags-aconfig-java",
		aconfig_declarations: "android.companion.virtual.flags-aconfig",

+1 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ flag {
		name: "activity_control_api"
		description: "Enable APIs for fine grained activity policy, fallback and callbacks"
		bug: "333443509"
		is_exported: true
		}

		flag {