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

Commit 99080fc1 authored by Roshan Pius's avatar Roshan Pius Committed by Automerger Merge Worker
Browse files

Merge "Add feature flag for disallow_cellular_null_ciphers" into main am:... 

Merge "Add feature flag for disallow_cellular_null_ciphers" into main am: 63ed3a0f am: dbb58f32 am: d5e88324

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



Change-Id: I9827d81162f60f097d2219cca7acdbbcf55339e1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 520f718d d5e88324

AconfigFlags.bp

+14 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ java_defaults { 




    // Add java_aconfig_libraries to here to add them to the core framework

    // Add java_aconfig_libraries to here to add them to the core framework

    srcs: [

    srcs: [

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

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

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

        ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",

        ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",

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

        ":com.android.window.flags.window-aconfig-java{.generated_srcjars}",
@@ -88,6 +89,19 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

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

}

}





// OS

aconfig_declarations {

    name: "android.os.flags-aconfig",

    package: "android.os",

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

}



java_aconfig_library {

    name: "android.os.flags-aconfig-java",

    aconfig_declarations: "android.os.flags-aconfig",

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

}



// Security

// Security

aconfig_declarations {

aconfig_declarations {

    name: "android.security.flags-aconfig",

    name: "android.security.flags-aconfig",

core/java/android/os/flags.aconfig

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



flag {

    name: "disallow_cellular_null_ciphers_restriction"

    namespace: "cellular_security"

    description: "Guards a new UserManager user restriction that admins can use to require cellular encryption on their managed devices."

    bug: "276752881"

}