summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeremy Meyer <jakmcbane@google.com> 2023-10-06 15:47:17 -0700
committer Mark Punzalan <markpun@google.com> 2023-12-18 15:15:19 -0800
commit16bbdc2a1423b853eca07a9301cd34d226ddb911 (patch)
tree7c7b16c025132aad4744b32bb671da1c141d527d
parentc809fceefd3e481d5d6a5a2c68746398c7cfc40c (diff)
Create first resources flag for default locale
Test: automated Bug: 117306409 Merged-In: If3a3de2325de0c31ebe92ab41631869008425728 Change-Id: If3a3de2325de0c31ebe92ab41631869008425728
-rw-r--r--AconfigFlags.bp14
-rw-r--r--core/java/android/content/res/flags.aconfig10
2 files changed, 24 insertions, 0 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index f96a1de078ed..02fee102b4c3 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -14,6 +14,7 @@
aconfig_srcjars = [
":android.content.pm.flags-aconfig-java{.generated_srcjars}",
+ ":android.content.res.flags-aconfig-java{.generated_srcjars}",
":android.hardware.biometrics.flags-aconfig-java{.generated_srcjars}",
":android.net.vcn.flags-aconfig-java{.generated_srcjars}",
":android.nfc.flags-aconfig-java{.generated_srcjars}",
@@ -190,6 +191,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"],
+}
+
// Biometrics
aconfig_declarations {
name: "android.hardware.biometrics.flags-aconfig",
diff --git a/core/java/android/content/res/flags.aconfig b/core/java/android/content/res/flags.aconfig
new file mode 100644
index 000000000000..0c2c0f494257
--- /dev/null
+++ b/core/java/android/content/res/flags.aconfig
@@ -0,0 +1,10 @@
+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
+}