Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Finalize @SystemApi annotation"

Browse Source
This commit is contained in:
Makoto Onuki
2020-02-05 01:33:10 +00:00
committed by Gerrit Code Review
parent bd34fd3c83 e0d9a5a4f8
commit 8de85f4b50
1 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/java/android/annotation/SystemApi.java
View File

@@ -47,22 +47,14 @@ public @interface SystemApi {
/** /**
* Specifies that the intended clients of a SystemApi are privileged apps. * Specifies that the intended clients of a SystemApi are privileged apps.
* This is the default value for {@link #client}. * This is the default value for {@link #client}.
* TODO Update the javadoc according to the final spec
*/ */
PRIVILEGED_APPS, PRIVILEGED_APPS,
/** /**
* DO NOT USE. Use PRIVILEGED_APPS instead. * Specifies that the intended clients of a SystemApi are used by classes in
* (This would provide no further protection over PRIVILEGED_APPS; do not rely on it) * <pre>BOOTCLASSPATH</pre> in mainline modules. Mainline modules can also expose
* @deprecated Use #PRIVILEGED_APPS instead * this type of system APIs too when they're used only by the non-updatable
*/ * platform code.
@Deprecated
MODULE_APPS,
/**
* Specifies that the intended clients of a SystemApi are modules implemented
* as libraries, like the conscrypt.jar in the conscrypt APEX.
* TODO Update the javadoc according to the final spec
*/ */
MODULE_LIBRARIES, MODULE_LIBRARIES,
@@ -70,19 +62,6 @@ public @interface SystemApi {
* Specifies that the system API is available only in the system server process. * Specifies that the system API is available only in the system server process.
* Use this to expose APIs from code loaded by the system server process <em>but</em> * Use this to expose APIs from code loaded by the system server process <em>but</em>
* not in <pre>BOOTCLASSPATH</pre>. * not in <pre>BOOTCLASSPATH</pre>.
* TODO(b/148177503) Update "services-stubs" and actually use it.
*/
SYSTEM_SERVER
}
/** @deprecated do not use */
@Deprecated
enum Process {
/** @deprecated do not use */
ALL,
/**
* @deprecated use Client#SYSTEM_SERVER instead
*/ */
SYSTEM_SERVER SYSTEM_SERVER
} }
@@ -92,13 +71,6 @@ public @interface SystemApi {
*/ */
Client client() default android.annotation.SystemApi.Client.PRIVILEGED_APPS; Client client() default android.annotation.SystemApi.Client.PRIVILEGED_APPS;
/**
* @deprecated use Client#SYSTEM_SERVER instead for system_server APIs
*/
@Deprecated
Process process() default android.annotation.SystemApi.Process.ALL;
/** /**
* Container for {@link SystemApi} that allows it to be applied repeatedly to types. * Container for {@link SystemApi} that allows it to be applied repeatedly to types.
*/ */