Merge "Add feature flag for disallow_cellular_null_ciphers" into main (fc37d7d3) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+14 −0

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

		// Add java_aconfig_libraries to here to add them to the core framework
		srcs: [
		":android.os.flags-aconfig-java{.generated_srcjars}",
		":android.security.flags-aconfig-java{.generated_srcjars}",
		":camera_platform_flags_core_java_lib{.generated_srcjars}",
		":com.android.window.flags.window-aconfig-java{.generated_srcjars}",
		@@ -78,3 +79,16 @@ java_aconfig_library {
		aconfig_declarations: "android.security.flags-aconfig",
		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"],
		}

0 → 100644

+8 −0

Original line number	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"
		}