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

Commit c5005722 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 am: cc8c3ecb 

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



Change-Id: Iea53b26168d3b4a94622bc883e7418b97bbabcb1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents be5a7291 cc8c3ecb

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

}