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

Merge "Preparing to finalize @SystemApi"

Browse Source
This commit is contained in:
Treehugger Robot
2020-01-27 21:20:40 +00:00
committed by Gerrit Code Review
parent bd9ff62138 14a1ab1b9d
commit 9f85cd1bdb
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,35 +44,43 @@ public @interface SystemApi {
enum Client { enum Client {
/** /**
* 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 implies * This is the default value for {@link #client}.
* MODULE_APPS and MODULE_LIBRARIES as well, which means that APIs will also * TODO Update the javadoc according to the final spec
* be available to module apps and jars.
*/ */
PRIVILEGED_APPS, PRIVILEGED_APPS,
/** /**
* Specifies that the intended clients of a SystemApi are modules implemented * DO NOT USE. Use PRIVILEGED_APPS instead.
* as apps, like the NetworkStack app. This implies MODULE_LIBRARIES as well, * (This would provide no further protection over PRIVILEGED_APPS; do not rely on it)
* which means that APIs will also be available to module jars. * @deprecated Use #PRIVILEGED_APPS instead
*/ */
@Deprecated
MODULE_APPS, MODULE_APPS,
/** /**
* Specifies that the intended clients of a SystemApi are modules implemented * Specifies that the intended clients of a SystemApi are modules implemented
* as libraries, like the conscrypt.jar in the conscrypt APEX. * as libraries, like the conscrypt.jar in the conscrypt APEX.
* TODO Update the javadoc according to the final spec
*/ */
MODULE_LIBRARIES MODULE_LIBRARIES,
/**
* 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>
* not in <pre>BOOTCLASSPATH</pre>.
* TODO(b/148177503) Update "services-stubs" and actually use it.
*/
SYSTEM_SERVER
} }
/** @deprecated do not use */
@Deprecated
enum Process { enum Process {
/** /** @deprecated do not use */
* Specifies that the SystemAPI is available in every Java processes.
* This is the default value for {@link #process}.
*/
ALL, ALL,
/** /**
* Specifies that the SystemAPI is available only in the system server process. * @deprecated use Client#SYSTEM_SERVER instead
*/ */
SYSTEM_SERVER SYSTEM_SERVER
} }
@@ -83,7 +91,8 @@ public @interface SystemApi {
Client client() default android.annotation.SystemApi.Client.PRIVILEGED_APPS; Client client() default android.annotation.SystemApi.Client.PRIVILEGED_APPS;
/** /**
* The process(es) that this SystemAPI is available * @deprecated use Client#SYSTEM_SERVER instead for system_server APIs
*/ */
@Deprecated
Process process() default android.annotation.SystemApi.Process.ALL; Process process() default android.annotation.SystemApi.Process.ALL;
} }