Snap for 11479893 from eea8aea495357b531a581a1856851778308ff00e to 24Q2-release (020775ab) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+5 −19

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ aconfig_declarations_group {
		"com.android.media.flags.bettertogether-aconfig-java",
		"com.android.media.flags.editing-aconfig-java",
		"com.android.media.flags.projection-aconfig-java",
		"com.android.net.thread.flags-aconfig-java",
		"com.android.net.thread.platform.flags-aconfig-java",
		"com.android.server.flags.services-aconfig-java",
		"com.android.text.flags-aconfig-java",
		"com.android.window.flags.window-aconfig-java",
		@@ -786,8 +786,8 @@ aconfig_declarations {

		// Thread network
		aconfig_declarations {
		name: "com.android.net.thread.flags-aconfig",
		package: "com.android.net.thread.flags",
		name: "com.android.net.thread.platform.flags-aconfig",
		package: "com.android.net.thread.platform.flags",
		srcs: ["core/java/android/net/thread/flags.aconfig"],
		}

		@@ -799,8 +799,8 @@ java_aconfig_library {
		}

		java_aconfig_library {
		name: "com.android.net.thread.flags-aconfig-java",
		aconfig_declarations: "com.android.net.thread.flags-aconfig",
		name: "com.android.net.thread.platform.flags-aconfig-java",
		aconfig_declarations: "com.android.net.thread.platform.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		@@ -910,8 +910,6 @@ java_aconfig_library {
		aconfig_declarations {
		name: "android.service.notification.flags-aconfig",
		package: "android.service.notification",
		exportable: true,
		container: "system",
		srcs: ["core/java/android/service/notification/flags.aconfig"],
		}

		@@ -921,18 +919,6 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		java_aconfig_library {
		name: "android.service.notification.flags-aconfig-export-java",
		aconfig_declarations: "android.service.notification.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		mode: "exported",
		min_sdk_version: "30",
		apex_available: [
		"//apex_available:platform",
		"com.android.extservices",
		],
		}

		// Smartspace
		aconfig_declarations {
		name: "android.app.smartspace.flags-aconfig",

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -508,6 +508,7 @@ java_library {
		lint: {
		baseline_filename: "lint-baseline.xml",
		},
		// For jarjar repackaging
		jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",
		}

Ravenwood.bp

+68 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,73 @@ java_genrule {
		],
		}

		java_library {
		name: "services.core-for-hoststubgen",
		installable: false, // host only jar.
		static_libs: [
		"services.core",
		],
		sdk_version: "core_platform",
		visibility: ["//visibility:private"],
		}

		java_genrule {
		name: "services.core.ravenwood-base",
		tools: ["hoststubgen"],
		cmd: "$(location hoststubgen) " +
		"@$(location ravenwood/ravenwood-standard-options.txt) " +

		"--debug-log $(location hoststubgen_services.core.log) " +
		"--stats-file $(location hoststubgen_services.core_stats.csv) " +

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

		"--gen-keep-all-file $(location hoststubgen_keep_all.txt) " +
		"--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) ",
		srcs: [
		":services.core-for-hoststubgen",
		"ravenwood/services.core-ravenwood-policies.txt",
		"ravenwood/ravenwood-standard-options.txt",
		"ravenwood/ravenwood-annotation-allowed-classes.txt",
		],
		out: [
		"ravenwood.jar",

		// Following files are created just as FYI.
		"hoststubgen_keep_all.txt",
		"hoststubgen_dump.txt",

		"hoststubgen_services.core.log",
		"hoststubgen_services.core_stats.csv",
		],
		visibility: ["//visibility:private"],
		}

		java_genrule {
		name: "services.core.ravenwood",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [
		":services.core.ravenwood-base{ravenwood.jar}",
		],
		out: [
		"services.core.ravenwood.jar",
		],
		}

		java_library {
		name: "services.core.ravenwood-jarjar",
		installable: false,
		static_libs: [
		"services.core.ravenwood",
		],
		jarjar_rules: ":ravenwood-services-jarjar-rules",
		}

		java_library {
		name: "mockito-ravenwood-prebuilt",
		installable: false,
		@@ -121,6 +188,7 @@ android_ravenwood_libgroup {
		"android.test.mock.ravenwood",
		"ravenwood-helper-runtime",
		"hoststubgen-helper-runtime.ravenwood",
		"services.core.ravenwood-jarjar",

		// Provide runtime versions of utils linked in below
		"junit",

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -11075,6 +11075,7 @@ package android.content {
		method public boolean hasCategory(String);
		method public boolean hasExtra(String);
		method public boolean hasFileDescriptors();
		method @FlaggedApi("android.security.enforce_intent_filter_match") public boolean isMismatchingFilter();
		method public static android.content.Intent makeMainActivity(android.content.ComponentName);
		method public static android.content.Intent makeMainSelectorActivity(String, String);
		method public static android.content.Intent makeRestartActivityTask(android.content.ComponentName);

core/api/test-current.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -1032,7 +1032,10 @@ package android.content {
		}

		public class Intent implements java.lang.Cloneable android.os.Parcelable {
		method @NonNull public android.content.Intent addExtendedFlags(int);
		method public int getExtendedFlags();
		field public static final String ACTION_USER_STOPPED = "android.intent.action.USER_STOPPED";
		field public static final int EXTENDED_FLAG_FILTER_MISMATCH = 1; // 0x1
		}

		public class SyncAdapterType implements android.os.Parcelable {
		@@ -3063,6 +3066,14 @@ package android.service.autofill.augmented {

		}

		package android.service.chooser {

		@FlaggedApi("android.service.chooser.enable_chooser_result") public final class ChooserResult implements android.os.Parcelable {
		ctor public ChooserResult(int, @Nullable android.content.ComponentName, boolean);
		}

		}

		package android.service.dreams {

		public abstract class DreamOverlayService extends android.app.Service {