Snap for 12014005 from 5999affa828a7916459dc25be4254a8e7b8f0c4b to 24Q4-release (c707c89a) · Commits · e / os / android_frameworks_base

Ravenwood.bp

+4 −78

Original line number	Diff line number	Diff line
		@@ -215,111 +215,37 @@ genrule {

		java_library {
		name: "services.core.ravenwood-jarjar",
		defaults: ["ravenwood-internal-only-visibility-java"],
		installable: false,
		static_libs: [
		"services.core.ravenwood",
		],
		jarjar_rules: ":ravenwood-services-jarjar-rules",
		visibility: ["//visibility:private"],
		}

		java_library {
		name: "services.fakes.ravenwood-jarjar",
		installable: false,
		srcs: [":services.fakes-sources"],
		libs: [
		"ravenwood-framework",
		"services.core.ravenwood",
		],
		jarjar_rules: ":ravenwood-services-jarjar-rules",
		visibility: ["//visibility:private"],
		}

		java_library {
		name: "mockito-ravenwood-prebuilt",
		installable: false,
		static_libs: [
		"mockito-robolectric-prebuilt",
		],
		}

		java_library {
		name: "inline-mockito-ravenwood-prebuilt",
		installable: false,
		static_libs: [
		"inline-mockito-robolectric-prebuilt",
		],
		}

		// Jars in "ravenwood-runtime" are set to the classpath, sorted alphabetically.
		// Rename some of the dependencies to make sure they're included in the intended order.
		java_genrule {
		name: "100-framework-minus-apex.ravenwood",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [":framework-minus-apex.ravenwood"],
		out: ["100-framework-minus-apex.ravenwood.jar"],
		visibility: ["//visibility:private"],
		}

		java_genrule {
		// Use 200 to make sure it comes before the mainline stub ("all-updatable...").
		name: "200-kxml2-android",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [":kxml2-android"],
		out: ["200-kxml2-android.jar"],
		visibility: ["//visibility:private"],
		}

		java_genrule {
		name: "z00-all-updatable-modules-system-stubs",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [":all-updatable-modules-system-stubs"],
		out: ["z00-all-updatable-modules-system-stubs.jar"],
		visibility: ["//visibility:private"],
		}

		android_ravenwood_libgroup {
		name: "ravenwood-runtime",
		libs: [
		"100-framework-minus-apex.ravenwood",
		"200-kxml2-android",

		"ravenwood-runtime-common-ravenwood",

		"android.test.mock.ravenwood",
		"ravenwood-helper-runtime",
		"hoststubgen-helper-runtime.ravenwood",
		"services.core.ravenwood-jarjar",
		"services.fakes.ravenwood-jarjar",

		// Provide runtime versions of utils linked in below
		"junit",
		"truth",
		"flag-junit",
		"ravenwood-framework",
		"ravenwood-junit-impl",
		"ravenwood-junit-impl-flag",
		"mockito-ravenwood-prebuilt",
		"inline-mockito-ravenwood-prebuilt",

		// It's a stub, so it should be towards the end.
		"z00-all-updatable-modules-system-stubs",
		],
		jni_libs: [
		"libandroid_runtime",
		"libravenwood_runtime",
		],
		}

		android_ravenwood_libgroup {
		name: "ravenwood-utils",
		libs: [
		"junit",
		"truth",
		"flag-junit",
		"ravenwood-framework",
		"ravenwood-junit",
		"mockito-ravenwood-prebuilt",
		"inline-mockito-ravenwood-prebuilt",
		],
		}

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@ package android {
		field public static final String CAMERA_OPEN_CLOSE_LISTENER = "android.permission.CAMERA_OPEN_CLOSE_LISTENER";
		field @FlaggedApi("com.android.internal.camera.flags.camera_privacy_allowlist") public static final String CAMERA_PRIVACY_ALLOWLIST = "android.permission.CAMERA_PRIVACY_ALLOWLIST";
		field public static final String CAPTURE_AUDIO_HOTWORD = "android.permission.CAPTURE_AUDIO_HOTWORD";
		field @FlaggedApi("android.os.allow_consentless_bugreport_delegated_consent") public static final String CAPTURE_CONSENTLESS_BUGREPORT_DELEGATED_CONSENT = "android.permission.CAPTURE_CONSENTLESS_BUGREPORT_DELEGATED_CONSENT";
		field public static final String CAPTURE_CONSENTLESS_BUGREPORT_ON_USERDEBUG_BUILD = "android.permission.CAPTURE_CONSENTLESS_BUGREPORT_ON_USERDEBUG_BUILD";
		field public static final String CAPTURE_MEDIA_OUTPUT = "android.permission.CAPTURE_MEDIA_OUTPUT";
		field public static final String CAPTURE_TUNER_AUDIO_INPUT = "android.permission.CAPTURE_TUNER_AUDIO_INPUT";

core/java/android/app/ApplicationPackageManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1128,7 +1128,7 @@ public class ApplicationPackageManager extends PackageManager {
		private static final PropertyInvalidatedCache<Integer, GetPackagesForUidResult>
		mGetPackagesForUidCache =
		new PropertyInvalidatedCache<Integer, GetPackagesForUidResult>(
		32, CACHE_KEY_PACKAGES_FOR_UID_PROPERTY) {
		1024, CACHE_KEY_PACKAGES_FOR_UID_PROPERTY) {
		@Override
		public GetPackagesForUidResult recompute(Integer uid) {
		try {

core/java/android/app/compat/ChangeIdStateCache.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ import com.android.internal.compat.IPlatformCompat;
		public final class ChangeIdStateCache
		extends PropertyInvalidatedCache<ChangeIdStateQuery, Boolean> {
		private static final String CACHE_KEY = "cache_key.is_compat_change_enabled";
		private static final int MAX_ENTRIES = 64;
		private static final int MAX_ENTRIES = 2048;
		private static boolean sDisabled = false;
		private volatile IPlatformCompat mPlatformCompat;

core/java/android/app/servertransaction/ClientTransaction.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -89,12 +89,10 @@ public class ClientTransaction implements Parcelable, ObjectPoolItem {
		* @param item A single message that can contain a client activity/window request/callback.
		*/
		public void addTransactionItem(@NonNull ClientTransactionItem item) {
		if (Flags.bundleClientTransactionFlag()) {
		if (mTransactionItems == null) {
		mTransactionItems = new ArrayList<>();
		}
		mTransactionItems.add(item);
		}

		// TODO(b/324203798): cleanup after remove UnsupportedAppUsage
		// Populate even if mTransactionItems is set to support the UnsupportedAppUsage.