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

Commit fd6f2cbd authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Add a flag for VCN safe mode configurability" into main am: 0f5e85a7 

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



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

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
aconfig_srcjars = [

    ":android.content.pm.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}",

    ":android.os.flags-aconfig-java{.generated_srcjars}",

    ":android.security.flags-aconfig-java{.generated_srcjars}",
@@ -197,3 +198,16 @@ java_aconfig_library { 
    aconfig_declarations: "com.android.net.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// VCN

aconfig_declarations {

    name: "android.net.vcn.flags-aconfig",

    package: "android.net.vcn",

    srcs: ["core/java/android/net/vcn/*.aconfig"],

}



java_aconfig_library {

    name: "android.net.vcn.flags-aconfig-java",

    aconfig_declarations: "android.net.vcn.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

core/java/android/net/vcn/flags.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "android.net.vcn"



flag {

    name: "safe_mode_config"

    namespace: "vcn"

    description: "Feature flag for safe mode configurability"

    bug: "276358140"

}
 
 No newline at end of file