Run Formatting on BP files and context.java (88478a93) · Commits · e / os / android_frameworks_base

api/Android.bp

+22 −22

Original line number	Original line	Diff line number	Diff line
	@@ -87,12 +87,12 @@ combined_apis {
	"framework-pdf-v",		"framework-pdf-v",
	"framework-permission",		"framework-permission",
	"framework-permission-s",		"framework-permission-s",
	"framework-profiling",
	"framework-photopicker",		"framework-photopicker",
			"framework-profiling",
	"framework-scheduling",		"framework-scheduling",
	"framework-sdkextensions",		"framework-sdkextensions",
	"framework-statsd",
	"framework-sdksandbox",		"framework-sdksandbox",
			"framework-statsd",
	"framework-tethering",		"framework-tethering",
	"framework-uwb",		"framework-uwb",
	"framework-virtualization",		"framework-virtualization",
	@@ -156,8 +156,8 @@ java_genrule {
	java_genrule {		java_genrule {
	name: "frameworks-base-api-current-compat",		name: "frameworks-base-api-current-compat",
	srcs: [		srcs: [
	":android.api.merged.public.latest",
	":android-incompatibilities.api.public.latest",		":android-incompatibilities.api.public.latest",
			":android.api.merged.public.latest",
	":frameworks-base-api-current.txt",		":frameworks-base-api-current.txt",
	],		],
	out: ["updated-baseline.txt"],		out: ["updated-baseline.txt"],
	@@ -186,8 +186,8 @@ java_genrule {
	java_genrule {		java_genrule {
	name: "frameworks-base-api-system-current-compat",		name: "frameworks-base-api-system-current-compat",
	srcs: [		srcs: [
	":android.api.merged.system.latest",
	":android-incompatibilities.api.system.latest",		":android-incompatibilities.api.system.latest",
			":android.api.merged.system.latest",
	":frameworks-base-api-current.txt",		":frameworks-base-api-current.txt",
	":frameworks-base-api-system-current.txt",		":frameworks-base-api-system-current.txt",
	],		],
	@@ -218,11 +218,11 @@ java_genrule {
	java_genrule {		java_genrule {
	name: "frameworks-base-api-module-lib-current-compat",		name: "frameworks-base-api-module-lib-current-compat",
	srcs: [		srcs: [
	":android.api.merged.module-lib.latest",
	":android-incompatibilities.api.module-lib.latest",		":android-incompatibilities.api.module-lib.latest",
			":android.api.merged.module-lib.latest",
	":frameworks-base-api-current.txt",		":frameworks-base-api-current.txt",
	":frameworks-base-api-system-current.txt",
	":frameworks-base-api-module-lib-current.txt",		":frameworks-base-api-module-lib-current.txt",
			":frameworks-base-api-system-current.txt",
	],		],
	out: ["updated-baseline.txt"],		out: ["updated-baseline.txt"],
	tools: ["metalava"],		tools: ["metalava"],
	@@ -241,8 +241,8 @@ java_genrule {
	out: ["current.srcjar"],		out: ["current.srcjar"],
	cmd: "$(location merge_zips) $(out) $(in)",		cmd: "$(location merge_zips) $(out) $(in)",
	srcs: [		srcs: [
	":api-stubs-docs-non-updatable{.exportable}",
	":all-modules-public-stubs-source-exportable",		":all-modules-public-stubs-source-exportable",
			":api-stubs-docs-non-updatable{.exportable}",
	],		],
	visibility: ["//visibility:private"], // Used by make module in //development, mind		visibility: ["//visibility:private"], // Used by make module in //development, mind
	}		}
	@@ -264,8 +264,8 @@ java_genrule {
	name: "sdk-annotations.zip",		name: "sdk-annotations.zip",
	defaults: ["sdk-annotations-defaults"],		defaults: ["sdk-annotations-defaults"],
	srcs: [		srcs: [
	":android-non-updatable-doc-stubs{.exportable.annotations.zip}",
	":all-modules-public-annotations",		":all-modules-public-annotations",
			":android-non-updatable-doc-stubs{.exportable.annotations.zip}",
	],		],
	}		}

	@@ -273,8 +273,8 @@ java_genrule {
	name: "sdk-annotations-system.zip",		name: "sdk-annotations-system.zip",
	defaults: ["sdk-annotations-defaults"],		defaults: ["sdk-annotations-defaults"],
	srcs: [		srcs: [
	":android-non-updatable-doc-stubs-system{.exportable.annotations.zip}",
	":all-modules-system-annotations",		":all-modules-system-annotations",
			":android-non-updatable-doc-stubs-system{.exportable.annotations.zip}",
	],		],
	}		}

	@@ -282,8 +282,8 @@ java_genrule {
	name: "sdk-annotations-module-lib.zip",		name: "sdk-annotations-module-lib.zip",
	defaults: ["sdk-annotations-defaults"],		defaults: ["sdk-annotations-defaults"],
	srcs: [		srcs: [
	":android-non-updatable-doc-stubs-module-lib{.exportable.annotations.zip}",
	":all-modules-module-lib-annotations",		":all-modules-module-lib-annotations",
			":android-non-updatable-doc-stubs-module-lib{.exportable.annotations.zip}",
	],		],
	}		}

	@@ -291,8 +291,8 @@ java_genrule {
	name: "sdk-annotations-system-server.zip",		name: "sdk-annotations-system-server.zip",
	defaults: ["sdk-annotations-defaults"],		defaults: ["sdk-annotations-defaults"],
	srcs: [		srcs: [
	":android-non-updatable-doc-stubs-system-server{.exportable.annotations.zip}",
	":all-modules-system-server-annotations",		":all-modules-system-server-annotations",
			":android-non-updatable-doc-stubs-system-server{.exportable.annotations.zip}",
	],		],
	}		}

	@@ -302,10 +302,10 @@ java_genrule {
	"//frameworks/base/boot",		"//frameworks/base/boot",
	],		],
	srcs: [		srcs: [
	":frameworks-base-api-removed.txt",
	":frameworks-base-api-system-removed.txt",
	":android.car-stubs-docs{.removed-api.txt}",		":android.car-stubs-docs{.removed-api.txt}",
	":android.car-system-stubs-docs{.removed-api.txt}",		":android.car-system-stubs-docs{.removed-api.txt}",
			":frameworks-base-api-removed.txt",
			":frameworks-base-api-system-removed.txt",
	],		],
	tool_files: ["gen_combined_removed_dex.sh"],		tool_files: ["gen_combined_removed_dex.sh"],
	tools: ["metalava"],		tools: ["metalava"],
	@@ -317,8 +317,8 @@ java_genrule {
	name: "api_fingerprint",		name: "api_fingerprint",
	srcs: [		srcs: [
	":frameworks-base-api-current.txt",		":frameworks-base-api-current.txt",
	":frameworks-base-api-system-current.txt",
	":frameworks-base-api-module-lib-current.txt",		":frameworks-base-api-module-lib-current.txt",
			":frameworks-base-api-system-current.txt",
	":frameworks-base-api-system-server-current.txt",		":frameworks-base-api-system-server-current.txt",
	],		],
	out: ["api_fingerprint.txt"],		out: ["api_fingerprint.txt"],
	@@ -376,9 +376,6 @@ stubs_defaults {
	"frameworks/base/media/aidl",		"frameworks/base/media/aidl",
	"frameworks/base/telephony/java",		"frameworks/base/telephony/java",
	"frameworks/native/libs/permission/aidl",		"frameworks/native/libs/permission/aidl",
	"packages/modules/Bluetooth/framework/aidl-export",
	"packages/modules/Connectivity/framework/aidl-export",
	"packages/modules/Media/apex/aidl/stable",
	"hardware/interfaces/biometrics/common/aidl",		"hardware/interfaces/biometrics/common/aidl",
	"hardware/interfaces/biometrics/fingerprint/aidl",		"hardware/interfaces/biometrics/fingerprint/aidl",
	"hardware/interfaces/common/aidl",		"hardware/interfaces/common/aidl",
	@@ -386,6 +383,9 @@ stubs_defaults {
	"hardware/interfaces/graphics/common/aidl",		"hardware/interfaces/graphics/common/aidl",
	"hardware/interfaces/keymaster/aidl",		"hardware/interfaces/keymaster/aidl",
	"hardware/interfaces/power/aidl",		"hardware/interfaces/power/aidl",
			"packages/modules/Bluetooth/framework/aidl-export",
			"packages/modules/Connectivity/framework/aidl-export",
			"packages/modules/Media/apex/aidl/stable",
	"system/hardware/interfaces/media/aidl",		"system/hardware/interfaces/media/aidl",
	],		],
	},		},
	@@ -395,10 +395,10 @@ stubs_defaults {
	// dependencies gets bigger.		// dependencies gets bigger.
	libs: android_non_updatable_stubs_libs,		libs: android_non_updatable_stubs_libs,
	flags: [		flags: [
			"--error FlaggedApiLiteral",
	"--error NoSettingsProvider",		"--error NoSettingsProvider",
	"--error UnhiddenSystemApi",
	"--error UnflaggedApi",		"--error UnflaggedApi",
	"--error FlaggedApiLiteral",		"--error UnhiddenSystemApi",
	"--force-convert-to-warning-nullability-annotations +:-android.:+android.icu.:-dalvik.",		"--force-convert-to-warning-nullability-annotations +:-android.:+android.icu.:-dalvik.",
	// Disable CallbackInterface, as Java 8 default interface methods avoid the extensibility		// Disable CallbackInterface, as Java 8 default interface methods avoid the extensibility
	// issue interfaces had previously.		// issue interfaces had previously.
	@@ -436,8 +436,8 @@ soong_config_module_type {
	// so use the prebuilt module-lib stubs for modules that export module-lib stubs that the		// so use the prebuilt module-lib stubs for modules that export module-lib stubs that the
	// non-updatable part depends on.		// non-updatable part depends on.
	non_updatable_api_deps_on_modules = [		non_updatable_api_deps_on_modules = [
	"sdk_module-lib_current_framework-tethering",
	"sdk_module-lib_current_framework-connectivity-t",		"sdk_module-lib_current_framework-connectivity-t",
			"sdk_module-lib_current_framework-tethering",
	"sdk_system_current_android",		"sdk_system_current_android",
	]		]

	@@ -487,8 +487,8 @@ java_defaults {
	impl_library_visibility: ["//frameworks/base"],		impl_library_visibility: ["//frameworks/base"],
	defaults_visibility: [		defaults_visibility: [
	"//frameworks/base/location",		"//frameworks/base/location",
	"//frameworks/base/packages/CrashRecovery/framework",
	"//frameworks/base/nfc",		"//frameworks/base/nfc",
			"//frameworks/base/packages/CrashRecovery/framework",
	"//packages/modules/NeuralNetworks:__subpackages__",		"//packages/modules/NeuralNetworks:__subpackages__",
	],		],
	plugins: ["error_prone_android_framework"],		plugins: ["error_prone_android_framework"],
	@@ -557,7 +557,7 @@ phony_rule {
	name: "checkapi",		name: "checkapi",
	phony_deps: [		phony_deps: [
	"frameworks-base-api-current-compat",		"frameworks-base-api-current-compat",
	"frameworks-base-api-system-current-compat",
	"frameworks-base-api-module-lib-current-compat",		"frameworks-base-api-module-lib-current-compat",
			"frameworks-base-api-system-current-compat",
	],		],
	}		}

api/ApiDocs.bp

+24 −25

Original line number	Original line	Diff line number	Diff line
	@@ -57,8 +57,8 @@ stubs_defaults {

	":framework-adservices-sources",		":framework-adservices-sources",
	":framework-appsearch-sources",		":framework-appsearch-sources",
	":framework-connectivity-sources",
	":framework-bluetooth-sources",		":framework-bluetooth-sources",
			":framework-connectivity-sources",
	":framework-connectivity-tiramisu-updatable-sources",		":framework-connectivity-tiramisu-updatable-sources",
	":framework-graphics-srcs",		":framework-graphics-srcs",
	":framework-healthfitness-sources",		":framework-healthfitness-sources",
	@@ -66,13 +66,13 @@ stubs_defaults {
	":framework-nearby-sources",		":framework-nearby-sources",
	":framework-nfc-updatable-sources",		":framework-nfc-updatable-sources",
	":framework-ondevicepersonalization-sources",		":framework-ondevicepersonalization-sources",
	":framework-permission-sources",
	":framework-permission-s-sources",		":framework-permission-s-sources",
			":framework-permission-sources",
	":framework-profiling-sources",		":framework-profiling-sources",
	":framework-scheduling-sources",		":framework-scheduling-sources",
	":framework-sdkextensions-sources",		":framework-sdkextensions-sources",
	":framework-statsd-sources",
	":framework-sdksandbox-sources",		":framework-sdksandbox-sources",
			":framework-statsd-sources",
	":framework-tethering-srcs",		":framework-tethering-srcs",
	":framework-uwb-updatable-sources",		":framework-uwb-updatable-sources",
	":framework-wifi-updatable-sources",		":framework-wifi-updatable-sources",
	@@ -105,8 +105,8 @@ droidstubs {
	"module-classpath-stubs-defaults",		"module-classpath-stubs-defaults",
	],		],
	flags: [		flags: [
	"--show-annotation android.annotation.SystemApi\$client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\$",
	"--show-annotation android.annotation.SystemApi\$client=android.annotation.SystemApi.Client.MODULE_LIBRARIES\$",		"--show-annotation android.annotation.SystemApi\$client=android.annotation.SystemApi.Client.MODULE_LIBRARIES\$",
			"--show-annotation android.annotation.SystemApi\$client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\$",
	],		],
	generate_stubs: false, // We're only using this module for the annotations.zip output, disable doc-stubs.		generate_stubs: false, // We're only using this module for the annotations.zip output, disable doc-stubs.
	write_sdk_values: false,		write_sdk_values: false,
	@@ -119,8 +119,8 @@ droidstubs {
	"module-classpath-stubs-defaults",		"module-classpath-stubs-defaults",
	],		],
	flags: [		flags: [
	"--show-annotation android.annotation.SystemApi\$client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\$",
	"--show-annotation android.annotation.SystemApi\$client=android.annotation.SystemApi.Client.MODULE_LIBRARIES\$",		"--show-annotation android.annotation.SystemApi\$client=android.annotation.SystemApi.Client.MODULE_LIBRARIES\$",
			"--show-annotation android.annotation.SystemApi\$client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\$",
	"--show-annotation android.annotation.SystemApi\$client=android.annotation.SystemApi.Client.SYSTEM_SERVER\$",		"--show-annotation android.annotation.SystemApi\$client=android.annotation.SystemApi.Client.SYSTEM_SERVER\$",
	],		],
	generate_stubs: false, // We're only using this module for the annotations.zip output, disable doc-stubs.		generate_stubs: false, // We're only using this module for the annotations.zip output, disable doc-stubs.
	@@ -194,8 +194,8 @@ doc_defaults {
	"docs/html",		"docs/html",
	],		],
	knowntags: [		knowntags: [
	"docs/knowntags.txt",
	":art.module.public.api{.doctags}",		":art.module.public.api{.doctags}",
			"docs/knowntags.txt",
	],		],
	custom_template: "droiddoc-templates-sdk",		custom_template: "droiddoc-templates-sdk",
	resourcesdir: "docs/html/reference/images/",		resourcesdir: "docs/html/reference/images/",
	@@ -203,15 +203,15 @@ doc_defaults {
	lint_baseline: "javadoc-lint-baseline",		lint_baseline: "javadoc-lint-baseline",
	flags: [		flags: [
	"-android",		"-android",
			"-lerror",
	"-manifest $(location :frameworks-base-core-AndroidManifest.xml)",		"-manifest $(location :frameworks-base-core-AndroidManifest.xml)",
	"-metalavaApiSince",		"-metalavaApiSince",
	"-werror",
	"-lerror",
	"-overview $(location :frameworks-base-java-overview)",		"-overview $(location :frameworks-base-java-overview)",
	// Federate Support Library references against local API file.		// Federate Support Library references against local API file.
	"-federate SupportLib https://developer.android.com",		"-federate SupportLib https://developer.android.com",
	"-federationapi SupportLib $(location :current-support-api)",		"-federationapi SupportLib $(location :current-support-api)",
	// Federate Support Library references against local API file.		// Federate Support Library references against local API file.
			"-werror",
	"-federate AndroidX https://developer.android.com",		"-federate AndroidX https://developer.android.com",
	"-federationapi AndroidX $(location :current-androidx-api)",		"-federationapi AndroidX $(location :current-androidx-api)",
	// doclava contains checks for a few issues that are have been migrated to metalava.		// doclava contains checks for a few issues that are have been migrated to metalava.
	@@ -227,16 +227,16 @@ doc_defaults {
	hdf: [		hdf: [
	"dac true",		"dac true",
	"sdk.codename O",		"sdk.codename O",
			"sdk.preview 0",
	"sdk.preview.version 1",		"sdk.preview.version 1",
	"sdk.version 7.0",
	"sdk.rel.id 1",		"sdk.rel.id 1",
	"sdk.preview 0",		"sdk.version 7.0",
	],		],
	arg_files: [		arg_files: [
			":current-androidx-api",
			":current-support-api",
	":frameworks-base-core-AndroidManifest.xml",		":frameworks-base-core-AndroidManifest.xml",
	":frameworks-base-java-overview",		":frameworks-base-java-overview",
	":current-support-api",
	":current-androidx-api",
	],		],
	// TODO(b/169090544): remove below aidl includes.		// TODO(b/169090544): remove below aidl includes.
	aidl: {		aidl: {
	@@ -281,8 +281,8 @@ droiddoc {
	proofread_file: "offline-sdk-referenceonly-docs-proofread.txt",		proofread_file: "offline-sdk-referenceonly-docs-proofread.txt",
	flags: [		flags: [
	"-offlinemode",		"-offlinemode",
	"-title \"Android SDK\"",
	"-referenceonly",		"-referenceonly",
			"-title \"Android SDK\"",
	],		],
	static_doc_index_redirect: "docs/docs-documentation-redirect.html",		static_doc_index_redirect: "docs/docs-documentation-redirect.html",
	static_doc_properties: "docs/source.properties",		static_doc_properties: "docs/source.properties",
	@@ -306,8 +306,8 @@ droiddoc {
	"-hide 104",		"-hide 104",
	"-hide 108",		"-hide 108",
	"-offlinemode",		"-offlinemode",
	"-title \"Android System SDK\"",
	"-referenceonly",		"-referenceonly",
			"-title \"Android System SDK\"",
	],		],
	static_doc_index_redirect: "docs/docs-documentation-redirect.html",		static_doc_index_redirect: "docs/docs-documentation-redirect.html",
	static_doc_properties: "docs/source.properties",		static_doc_properties: "docs/source.properties",
	@@ -320,13 +320,13 @@ droiddoc {
	":framework-doc-stubs{.exportable}",		":framework-doc-stubs{.exportable}",
	],		],
	hdf: [		hdf: [
	"android.whichdoc online",
	"android.hasSamples true",		"android.hasSamples true",
			"android.whichdoc online",
	],		],
	proofread_file: "ds-docs-proofread.txt",		proofread_file: "ds-docs-proofread.txt",
	flags: [		flags: [
	" -toroot /",		" -toroot /",
	"-yamlV2",		"-devsite",
	"-samplegroup Admin",		"-samplegroup Admin",
	"-samplegroup Background",		"-samplegroup Background",
	"-samplegroup Connectivity",		"-samplegroup Connectivity",
	@@ -342,9 +342,8 @@ droiddoc {
	"-samplegroup UI",		"-samplegroup UI",
	"-samplegroup Views",		"-samplegroup Views",
	"-samplegroup Wearable",		"-samplegroup Wearable",
	"-devsite",		"-samplesdir development/samples/browseable",
	"-samplesdir",		"-yamlV2",
	"development/samples/browseable",
	],		],
	}		}

	@@ -354,8 +353,8 @@ droiddoc {
	":framework-doc-stubs{.exportable}",		":framework-doc-stubs{.exportable}",
	],		],
	flags: [		flags: [
	"-noJdkLink",
	"-links https://kotlinlang.org/api/latest/jvm/stdlib/^external/dokka/package-list",		"-links https://kotlinlang.org/api/latest/jvm/stdlib/^external/dokka/package-list",
			"-noJdkLink",
	"-noStdlibLink",		"-noStdlibLink",
	],		],
	proofread_file: "ds-dokka-proofread.txt",		proofread_file: "ds-dokka-proofread.txt",
	@@ -365,8 +364,8 @@ droiddoc {
	java_genrule {		java_genrule {
	name: "ds-docs",		name: "ds-docs",
	tools: [		tools: [
	"zip2zip",
	"merge_zips",		"merge_zips",
			"zip2zip",
	],		],
	srcs: [		srcs: [
	":ds-docs-java{.docs.zip}",		":ds-docs-java{.docs.zip}",
	@@ -383,8 +382,8 @@ java_genrule {
	java_genrule {		java_genrule {
	name: "ds-docs-switched",		name: "ds-docs-switched",
	tools: [		tools: [
	"switcher4",
	"soong_zip",		"soong_zip",
			"switcher4",
	],		],
	srcs: [		srcs: [
	":ds-docs-java{.docs.zip}",		":ds-docs-java{.docs.zip}",
	@@ -411,10 +410,10 @@ droiddoc {
	"android.whichdoc online",		"android.whichdoc online",
	],		],
	flags: [		flags: [
	"-staticonly",
	"-toroot /",
	"-devsite",		"-devsite",
	"-ignoreJdLinks",		"-ignoreJdLinks",
			"-staticonly",
			"-toroot /",
	],		],
	}		}

	@@ -428,8 +427,8 @@ droiddoc {
	"android.whichdoc online",		"android.whichdoc online",
	],		],
	flags: [		flags: [
	"-toroot /",
	"-atLinksNavtree",		"-atLinksNavtree",
	"-navtreeonly",		"-navtreeonly",
			"-toroot /",
	],		],
	}		}

core/java/android/content/Context.java

+149 −148

Original line number	Original line	Diff line number	Diff line
	@@ -4260,7 +4260,9 @@ public abstract class Context {
	@Nullable String profileFile, @Nullable Bundle arguments);		@Nullable String profileFile, @Nullable Bundle arguments);

	/** @hide */		/** @hide */
	@StringDef(suffix = { "_SERVICE" }, value = {		@StringDef(
			suffix = {"_SERVICE"},
			value = {
	POWER_SERVICE,		POWER_SERVICE,
	// @hide: POWER_STATS_SERVICE,		// @hide: POWER_STATS_SERVICE,
	WINDOW_SERVICE,		WINDOW_SERVICE,
	@@ -4406,7 +4408,6 @@ public abstract class Context {
	RANGING_SERVICE,		RANGING_SERVICE,
	MEDIA_QUALITY_SERVICE,		MEDIA_QUALITY_SERVICE,
	ADVANCED_PROTECTION_SERVICE,		ADVANCED_PROTECTION_SERVICE,

	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface ServiceName {}		public @interface ServiceName {}