Snap for 11881322 from ec30de26bd503ec53d9dbd534733491113a68569 to 24Q3-release (22b0a10b) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+11 −3

Original line number	Original line	Diff line number	Diff line
	@@ -685,15 +685,17 @@ java_aconfig_library {
	// Permissions		// Permissions
	aconfig_declarations {		aconfig_declarations {
	name: "android.permission.flags-aconfig",		name: "android.permission.flags-aconfig",
	package: "android.permission.flags",
	container: "system",		container: "system",
			package: "android.permission.flags",
			exportable: true,
	srcs: ["core/java/android/permission/flags.aconfig"],		srcs: ["core/java/android/permission/flags.aconfig"],
	}		}

	java_aconfig_library {		java_aconfig_library {
	name: "android.permission.flags-aconfig-java",		name: "android.permission.flags-aconfig-java-export",
	aconfig_declarations: "android.permission.flags-aconfig",		aconfig_declarations: "android.permission.flags-aconfig",
	defaults: ["framework-minus-apex-aconfig-java-defaults"],		defaults: ["framework-minus-apex-aconfig-java-defaults"],
			mode: "exported",
	min_sdk_version: "30",		min_sdk_version: "30",
	apex_available: [		apex_available: [
	"//apex_available:platform",		"//apex_available:platform",
	@@ -708,9 +710,15 @@ java_aconfig_library {
	host_supported: true,		host_supported: true,
	defaults: ["framework-minus-apex-aconfig-java-defaults"],		defaults: ["framework-minus-apex-aconfig-java-defaults"],
	min_sdk_version: "30",		min_sdk_version: "30",
			}

			java_aconfig_library {
			name: "android.permission.flags-aconfig-java",
			aconfig_declarations: "android.permission.flags-aconfig",
			defaults: ["framework-minus-apex-aconfig-java-defaults"],
			min_sdk_version: "30",
	apex_available: [		apex_available: [
	"//apex_available:platform",		"//apex_available:platform",
	"com.android.permission",
	"com.android.nfcservices",		"com.android.nfcservices",
	],		],
	}		}

Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -425,6 +425,7 @@ java_defaults {
	"sounddose-aidl-java",		"sounddose-aidl-java",
	"modules-utils-expresslog",		"modules-utils-expresslog",
	"perfetto_trace_javastream_protos_jarjar",		"perfetto_trace_javastream_protos_jarjar",
			"libaconfig_java_proto_nano",
	],		],
	}		}

boot/boot-image-profile.txt

+1114 −1162

File changed.

Preview size limit exceeded, changes collapsed.

boot/preloaded-classes

+128 −70

File changed.

Preview size limit exceeded, changes collapsed.

config/boot-image-profile.txt

+1186 −1199

File changed.

Preview size limit exceeded, changes collapsed.