diff options
| -rw-r--r-- | core/java/android/annotation/SystemApi.java | 22 | ||||
| -rw-r--r-- | services/Android.bp | 2 |
2 files changed, 22 insertions, 2 deletions
diff --git a/core/java/android/annotation/SystemApi.java b/core/java/android/annotation/SystemApi.java index f589cc5704b4..2cb93e4f8cea 100644 --- a/core/java/android/annotation/SystemApi.java +++ b/core/java/android/annotation/SystemApi.java @@ -44,9 +44,24 @@ public @interface SystemApi { enum Client { /** * 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}. This implies + * MODULE_APPS and MODULE_LIBRARIES as well, which means that APIs will also + * be available to module apps and jars. */ PRIVILEGED_APPS, + + /** + * Specifies that the intended clients of a SystemApi are modules implemented + * as apps, like the NetworkStack app. This implies MODULE_LIBRARIES as well, + * which means that APIs will also be available to module jars. + */ + MODULE_APPS, + + /** + * Specifies that the intended clients of a SystemApi are modules implemented + * as libraries, like the conscrypt.jar in the conscrypt APEX. + */ + MODULE_LIBRARIES } enum Process { @@ -55,6 +70,11 @@ public @interface SystemApi { * This is the default value for {@link #process}. */ ALL, + + /** + * Specifies that the SystemAPI is available only in the system server process. + */ + SYSTEM_SERVER } /** diff --git a/services/Android.bp b/services/Android.bp index 72c13747e011..e83472e0be05 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -110,7 +110,7 @@ droidstubs { srcs: [":services-sources"], installable: false, // TODO: remove the --hide options below - args: " --show-single-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.INTERNAL,process=android.annotation.SystemApi.Process.SYSTEM_SERVER\\)" + + args: " --show-single-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES,process=android.annotation.SystemApi.Process.SYSTEM_SERVER\\)" + " --hide-annotation android.annotation.Hide" + " --hide-package com.google.android.startop.iorap" + " --hide ReferencesHidden" + |