Merge "SystemApi is parameterized" (b4f91be2) · Commits · e / os / android_frameworks_base

Android.bp

+5 −5

Original line number	Diff line number	Diff line
		@@ -1178,7 +1178,7 @@ droidstubs {
		arg_files: [
		"core/res/AndroidManifest.xml",
		],
		args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi ",
		args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\) ",
		write_sdk_values: true,
		}

		@@ -1489,7 +1489,7 @@ droidstubs {
		merge_annotations_dirs: [
		"metalava-manual",
		],
		args: " --show-annotation android.annotation.SystemApi",
		args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\)",
		}

		java_library_static {
		@@ -1511,7 +1511,7 @@ droidstubs {
		removed_dex_api_filename: "removed-dex.txt",
		args: metalava_framework_docs_args +
		" --show-unannotated " +
		" --show-annotation android.annotation.SystemApi " +
		" --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\) " +
		" --show-annotation android.annotation.TestApi ",
		}

		@@ -1530,7 +1530,7 @@ droidstubs {
		" --hide ReferencesHidden " +
		" --hide UnhiddenSystemApi " +
		" --show-unannotated " +
		" --show-annotation android.annotation.SystemApi " +
		" --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\) " +
		" --show-annotation android.annotation.TestApi ",
		}

		@@ -1574,7 +1574,7 @@ droidstubs {
		arg_files: [
		"core/res/AndroidManifest.xml",
		],
		args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi",
		args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\)",
		check_api: {
		current: {
		api_file: "api/system-current.txt",

core/java/android/annotation/SystemApi.java

+25 −0

Original line number	Diff line number	Diff line
		@@ -41,4 +41,29 @@ import java.lang.annotation.Target;
		@Target({TYPE, FIELD, METHOD, CONSTRUCTOR, ANNOTATION_TYPE, PACKAGE})
		@Retention(RetentionPolicy.RUNTIME)
		public @interface SystemApi {
		enum Client {
		/**
		* Specifies that the intended clients of a SystemApi are privileged apps.
		* This is the default value for {@link #client}.
		*/
		PRIVILEGED_APPS,
		}

		enum Process {
		/**
		* Specifies that the SystemAPI is available in every Java processes.
		* This is the default value for {@link #process}.
		*/
		ALL,
		}

		/**
		* The intended client of this SystemAPI.
		*/
		Client client() default android.annotation.SystemApi.Client.PRIVILEGED_APPS;

		/**
		* The process(es) that this SystemAPI is available
		*/
		Process process() default android.annotation.SystemApi.Process.ALL;
		}

media/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ metalava_updatable_media_args = " --error UnhiddenSystemApi " +
		"--hide MissingPermission --hide BroadcastBehavior " +
		"--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " +
		"--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " +
		"--hide HiddenTypedefConstant --show-annotation android.annotation.SystemApi "
		"--hide HiddenTypedefConstant --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\) "

		droidstubs {
		name: "updatable-media-stubs",

services/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ droidstubs {
		srcs: [":services-sources"],
		installable: false,
		// TODO: remove the --hide options below
		args: " --show-single-annotation android.annotation.SystemApi" +
		args: " --show-single-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.INTERNAL,process=android.annotation.SystemApi.Process.SYSTEM_SERVER\\)" +
		" --hide-annotation android.annotation.Hide" +
		" --hide-package com.google.android.startop.iorap" +
		" --hide ReferencesHidden" +