Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc8c3ecb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Create first resources flag for default locale" into main am: 0c668d12 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2852833



Change-Id: I47a550e74a6f2306cf7dc0474596e2046a43b5d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6f723d7 0c668d12

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -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",

core/java/android/content/res/flags.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

}