Merge "Set up aconfig / new android.service.chooser flag" into main (9db1b7f3) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+14 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ aconfig_srcjars = [
		":android.os.flags-aconfig-java{.generated_srcjars}",
		":android.os.vibrator.flags-aconfig-java{.generated_srcjars}",
		":android.security.flags-aconfig-java{.generated_srcjars}",
		":android.service.chooser.flags-aconfig-java{.generated_srcjars}",
		":android.service.notification.flags-aconfig-java{.generated_srcjars}",
		":android.view.flags-aconfig-java{.generated_srcjars}",
		":android.view.accessibility.flags-aconfig-java{.generated_srcjars}",
		@@ -683,6 +684,19 @@ cc_aconfig_library {
		aconfig_declarations: "device_policy_aconfig_flags",
		}

		// Chooser / "Sharesheet"
		aconfig_declarations {
		name: "android.service.chooser.flags-aconfig",
		package: "android.service.chooser",
		srcs: ["core/java/android/service/chooser/flags.aconfig"],
		}

		java_aconfig_library {
		name: "android.service.chooser.flags-aconfig-java",
		aconfig_declarations: "android.service.chooser.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// JobScheduler
		aconfig_declarations {
		name: "framework-jobscheduler-job.flags-aconfig",

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		package: "android.service.chooser"

		flag {
		name: "support_nfc_resolver"
		namespace: "systemui"
		description: "This flag controls the new NFC 'resolver' activity"
		bug: "268089816"
		}