Snap for 11648291 from df0d9ea9d111879c89b942e9a557c2c9e4a6d0cf to 24Q3-release (cec8535c) · Commits · e / os / android_frameworks_base

Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -389,7 +389,6 @@ java_defaults {
		// TODO(b/120066492): remove gps_debug and protolog.conf.json when the build
		// system propagates "required" properly.
		"gps_debug.conf",
		"core.protolog.pb",
		"framework-res",
		// any install dependencies should go into framework-minus-apex-install-dependencies
		// rather than here to avoid bloating incremental build time

Ravenwood.bp

+38 −12

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ java_genrule {
		name: "framework-minus-apex.ravenwood-base",
		tools: ["hoststubgen"],
		cmd: "$(location hoststubgen) " +
		"@$(location ravenwood/ravenwood-standard-options.txt) " +
		"@$(location ravenwood/texts/ravenwood-standard-options.txt) " +

		"--debug-log $(location hoststubgen_framework-minus-apex.log) " +
		"--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " +
		@@ -41,13 +41,13 @@ java_genrule {
		"--gen-input-dump-file $(location hoststubgen_dump.txt) " +

		"--in-jar $(location :framework-minus-apex-for-hoststubgen) " +
		"--policy-override-file $(location ravenwood/framework-minus-apex-ravenwood-policies.txt) " +
		"--annotation-allowed-classes-file $(location ravenwood/ravenwood-annotation-allowed-classes.txt) ",
		"--policy-override-file $(location ravenwood/texts/framework-minus-apex-ravenwood-policies.txt) " +
		"--annotation-allowed-classes-file $(location ravenwood/texts/ravenwood-annotation-allowed-classes.txt) ",
		srcs: [
		":framework-minus-apex-for-hoststubgen",
		"ravenwood/framework-minus-apex-ravenwood-policies.txt",
		"ravenwood/ravenwood-standard-options.txt",
		"ravenwood/ravenwood-annotation-allowed-classes.txt",
		"ravenwood/texts/framework-minus-apex-ravenwood-policies.txt",
		"ravenwood/texts/ravenwood-standard-options.txt",
		"ravenwood/texts/ravenwood-annotation-allowed-classes.txt",
		],
		out: [
		"ravenwood.jar",
		@@ -77,6 +77,19 @@ java_genrule {
		],
		}

		// Extract the stats file.
		genrule {
		name: "framework-minus-apex.ravenwood.stats",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [
		":framework-minus-apex.ravenwood-base{hoststubgen_framework-minus-apex_stats.csv}",
		],
		out: [
		"hoststubgen_framework-minus-apex_stats.csv",
		],
		}

		java_library {
		name: "services.core-for-hoststubgen",
		installable: false, // host only jar.
		@@ -91,7 +104,7 @@ java_genrule {
		name: "services.core.ravenwood-base",
		tools: ["hoststubgen"],
		cmd: "$(location hoststubgen) " +
		"@$(location ravenwood/ravenwood-standard-options.txt) " +
		"@$(location ravenwood/texts/ravenwood-standard-options.txt) " +

		"--debug-log $(location hoststubgen_services.core.log) " +
		"--stats-file $(location hoststubgen_services.core_stats.csv) " +
		@@ -102,13 +115,13 @@ java_genrule {
		"--gen-input-dump-file $(location hoststubgen_dump.txt) " +

		"--in-jar $(location :services.core-for-hoststubgen) " +
		"--policy-override-file $(location ravenwood/services.core-ravenwood-policies.txt) " +
		"--annotation-allowed-classes-file $(location ravenwood/ravenwood-annotation-allowed-classes.txt) ",
		"--policy-override-file $(location ravenwood/texts/services.core-ravenwood-policies.txt) " +
		"--annotation-allowed-classes-file $(location ravenwood/texts/ravenwood-annotation-allowed-classes.txt) ",
		srcs: [
		":services.core-for-hoststubgen",
		"ravenwood/services.core-ravenwood-policies.txt",
		"ravenwood/ravenwood-standard-options.txt",
		"ravenwood/ravenwood-annotation-allowed-classes.txt",
		"ravenwood/texts/services.core-ravenwood-policies.txt",
		"ravenwood/texts/ravenwood-standard-options.txt",
		"ravenwood/texts/ravenwood-annotation-allowed-classes.txt",
		],
		out: [
		"ravenwood.jar",
		@@ -135,6 +148,19 @@ java_genrule {
		],
		}

		// Extract the stats file.
		genrule {
		name: "services.core.ravenwood.stats",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [
		":services.core.ravenwood-base{hoststubgen_services.core_stats.csv}",
		],
		out: [
		"hoststubgen_services.core_stats.csv",
		],
		}

		java_library {
		name: "services.core.ravenwood-jarjar",
		installable: false,

apex/jobscheduler/framework/java/android/app/job/JobInfo.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2054,8 +2054,8 @@ public class JobInfo implements Parcelable {
		* or in a state where launching an activity is allowed, as defined
		* <a href=
		* "https://developer.android.com/guide/components/activities/background-starts#exceptions">
		* here</a>. Attempting to schedule one outside of these conditions will throw a
		* {@link SecurityException}.
		* here</a>. Attempting to schedule one outside of these conditions will return a
		* {@link JobScheduler#RESULT_FAILURE}.
		*
		* <p>
		* This should <b>NOT</b> be used for automatic features.

core/api/current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -10147,17 +10147,17 @@ package android.content {

		public interface ComponentCallbacks {
		method public void onConfigurationChanged(@NonNull android.content.res.Configuration);
		method public void onLowMemory();
		method @Deprecated public void onLowMemory();
		}

		public interface ComponentCallbacks2 extends android.content.ComponentCallbacks {
		method public void onTrimMemory(int);
		field public static final int TRIM_MEMORY_BACKGROUND = 40; // 0x28
		field public static final int TRIM_MEMORY_COMPLETE = 80; // 0x50
		field public static final int TRIM_MEMORY_MODERATE = 60; // 0x3c
		field public static final int TRIM_MEMORY_RUNNING_CRITICAL = 15; // 0xf
		field public static final int TRIM_MEMORY_RUNNING_LOW = 10; // 0xa
		field public static final int TRIM_MEMORY_RUNNING_MODERATE = 5; // 0x5
		field @Deprecated public static final int TRIM_MEMORY_COMPLETE = 80; // 0x50
		field @Deprecated public static final int TRIM_MEMORY_MODERATE = 60; // 0x3c
		field @Deprecated public static final int TRIM_MEMORY_RUNNING_CRITICAL = 15; // 0xf
		field @Deprecated public static final int TRIM_MEMORY_RUNNING_LOW = 10; // 0xa
		field @Deprecated public static final int TRIM_MEMORY_RUNNING_MODERATE = 5; // 0x5
		field public static final int TRIM_MEMORY_UI_HIDDEN = 20; // 0x14
		}

core/api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -3676,6 +3676,10 @@ package android.view {
		field public static final int FLAG_IS_ACCESSIBILITY_EVENT = 2048; // 0x800
		}

		public final class PointerIcon implements android.os.Parcelable {
		method @FlaggedApi("android.view.flags.enable_vector_cursors") public void setDrawNativeDropShadow(boolean);
		}

		@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD}) public @interface RemotableViewMethod {
		method public abstract String asyncImpl() default "";
		}