Snap for 12596896 from 13186b0aa41992c76fe5742e143127e74c3e1a0b to 25Q2-release (7f2f8530) · Commits · e / os / android_frameworks_base

ACTIVITY_SECURITY_OWNERS

0 → 100644

+2 −0

+1 −0

Original line number	Diff line number	Diff line
		@@ -1560,6 +1560,7 @@ java_aconfig_library {
		name: "android.crashrecovery.flags-aconfig-java",
		aconfig_declarations: "android.crashrecovery.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		min_sdk_version: "35",
		apex_available: [
		"//apex_available:platform",
		"com.android.crashrecovery",

+12 −5

Original line number	Diff line number	Diff line
		@@ -144,9 +144,6 @@ filegroup {
		// For the generated R.java and Manifest.java
		":framework-res{.aapt.srcjar}",

		// Java/AIDL sources to be moved out to CrashRecovery module
		":framework-crashrecovery-sources",

		// etc.
		":framework-javastream-protos",
		":statslog-framework-java-gen", // FrameworkStatsLog.java
		@@ -432,7 +429,12 @@ java_library {
		name: "framework-non-updatable-unbundled-impl-libs",
		static_libs: [
		"framework-location.impl",
		] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {
		"true": [],
		default: [
		"framework-platformcrashrecovery.impl",
		],
		}),
		sdk_version: "core_platform",
		installable: false,
		}
		@@ -565,7 +567,12 @@ java_library {
		"documents-ui-compat-config",
		"calendar-provider-compat-config",
		"contacts-provider-platform-compat-config",
		] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {
		"true": [],
		default: [
		"framework-platformcrashrecovery-compat-config",
		],
		}),
		}

		platform_compat_config {

+1 −0

Original line number	Diff line number	Diff line
		include /PACKAGE_MANAGER_OWNERS
		include /services/core/java/com/android/server/wm/OWNERS
		include /services/core/java/com/android/server/am/OWNERS
		include /ACTIVITY_SECURITY_OWNERS
		No newline at end of file

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,3 +47,4 @@ per-file MULTIUSER_OWNERS = file:/MULTIUSER_OWNERS
		per-file BROADCASTS_OWNERS = file:/BROADCASTS_OWNERS
		per-file ADPF_OWNERS = file:/ADPF_OWNERS
		per-file GAME_MANAGER_OWNERS = file:/GAME_MANAGER_OWNERS
		per-file SDK_OWNERS = file:/SDK_OWNERS