Merge "Create first resources flag for default locale" into main (1d9c8003) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+14 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ aconfig_srcjars = [
		":android.app.usage.flags-aconfig-java{.generated_srcjars}",
		":android.companion.flags-aconfig-java{.generated_srcjars}",
		":android.content.pm.flags-aconfig-java{.generated_srcjars}",
		":android.content.res.flags-aconfig-java{.generated_srcjars}",
		":android.hardware.radio.flags-aconfig-java{.generated_srcjars}",
		":android.nfc.flags-aconfig-java{.generated_srcjars}",
		":android.os.flags-aconfig-java{.generated_srcjars}",
		@@ -306,6 +307,19 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Resources
		aconfig_declarations {
		name: "android.content.res.flags-aconfig",
		package: "android.content.res",
		srcs: ["core/java/android/content/res/*.aconfig"],
		}

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

		// Media BetterTogether
		aconfig_declarations {
		name: "com.android.media.flags.bettertogether-aconfig",

0 → 100644

+10 −0

Original line number	Diff line number	Diff line
		package: "android.content.res"

		flag {
		name: "default_locale"
		namespace: "resource_manager"
		description: "Feature flag for default locale in LocaleConfig"
		bug: "117306409"
		# fixed_read_only or device wont boot because of permission issues accessing flags during boot
		is_fixed_read_only: true
		}