Snap for 12205827 from 67271f5bb119609a4f9400b505537de5449cea83 to 24Q4-release (b1332624) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -172,6 +172,7 @@ cc_aconfig_library {
		// Window
		aconfig_declarations {
		name: "com.android.window.flags.window-aconfig",
		exportable: true,
		package: "com.android.window.flags",
		container: "system",
		srcs: ["core/java/android/window/flags/*.aconfig"],

Ravenwood.bp

+15 −17

Original line number	Diff line number	Diff line
		@@ -43,29 +43,14 @@ genrule_defaults {
		],
		out: [
		"ravenwood.jar",

		// Following files are created just as FYI.
		"hoststubgen_framework-minus-apex_keep_all.txt",
		"hoststubgen_framework-minus-apex_dump.txt",

		"hoststubgen_framework-minus-apex.log",
		"hoststubgen_framework-minus-apex_stats.csv",
		"hoststubgen_framework-minus-apex_apis.csv",
		],
		}

		framework_minus_apex_cmd = "$(location hoststubgen) " +
		"@$(location :ravenwood-standard-options) " +

		"--debug-log $(location hoststubgen_framework-minus-apex.log) " +
		"--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " +
		"--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +

		"--out-impl-jar $(location ravenwood.jar) " +

		"--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +
		"--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " +

		"--in-jar $(location :framework-minus-apex-for-hoststubgen) " +
		"--policy-override-file $(location :ravenwood-framework-policies) " +
		"--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) "
		@@ -133,13 +118,26 @@ java_genrule {
		// Build framework-minus-apex.ravenwood-base without sharding.
		// We extract the various dump files from this one, rather than the sharded ones, because
		// some dumps use the output from other classes (e.g. base classes) which may not be in the
		// same shard.
		// same shard. Also some of the dump files ("apis") may be slow even when sharded, because
		// the output contains the information from all the input classes, rather than the output classes.
		// Not using sharding is fine for this module because it's only used for collecting the
		// dump / stats files, which don't have to happen regularly.
		java_genrule {
		name: "framework-minus-apex.ravenwood-base_all",
		defaults: ["framework-minus-apex.ravenwood-base_defaults"],
		cmd: framework_minus_apex_cmd,
		cmd: framework_minus_apex_cmd +
		"--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " +
		"--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +

		"--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +
		"--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) ",

		out: [
		"hoststubgen_framework-minus-apex_keep_all.txt",
		"hoststubgen_framework-minus-apex_dump.txt",
		"hoststubgen_framework-minus-apex_stats.csv",
		"hoststubgen_framework-minus-apex_apis.csv",
		],
		}

		// Marge all the sharded jars

core/java/android/app/ResourcesManager.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -1836,9 +1836,10 @@ public class ResourcesManager {
		// have shared library asset paths appended if there are any.
		if (r.getImpl() != null) {
		final ResourcesImpl oldImpl = r.getImpl();
		final AssetManager oldAssets = oldImpl.getAssets();
		// ResourcesImpl constructor will help to append shared library asset paths.
		if (oldImpl.getAssets().isUpToDate()) {
		final ResourcesImpl newImpl = new ResourcesImpl(oldImpl.getAssets(),
		if (oldAssets != AssetManager.getSystem() && oldAssets.isUpToDate()) {
		final ResourcesImpl newImpl = new ResourcesImpl(oldAssets,
		oldImpl.getMetrics(), oldImpl.getConfiguration(),
		oldImpl.getDisplayAdjustments());
		r.setImpl(newImpl);

core/java/android/app/admin/flags/flags.aconfig

+10 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ flag {
		}
		}


		flag {
		name: "onboarding_bugreport_v2_enabled"
		is_exported: true
		@@ -403,3 +402,13 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "dont_read_policy_definition"
		namespace: "enterprise"
		description: "Rely on <policy-key-entry> to determine policy definition and ignore <policy-definition-entry>"
		bug: "335663055"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

core/java/android/content/pm/multiuser.aconfig

+13 −0

Original line number	Diff line number	Diff line
		@@ -150,6 +150,16 @@ flag {
		}
		}

		flag {
		name: "fix_avatar_cross_user_leak"
		namespace: "multiuser"
		description: "Fix cross-user picture uri leak for avatar picker apps."
		bug: "341688848"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "fix_get_user_property_cache"
		namespace: "multiuser"
		@@ -386,4 +396,7 @@ flag {
		description: "Refactorings related to unicorn mode to work on HSUM mode (Read only flag)"
		bug: "339201286"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}
		No newline at end of file