diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-12 18:42:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-12 18:42:53 +0000 |
| commit | d785329abb392d1d97883a25bed87d399c1925f7 (patch) | |
| tree | 81c1467fed5131485b62c0cb9f277a118317d0b6 /core/java/android | |
| parent | b3a0f10a8eb9ca36ea78b67f30e510845e0aa54d (diff) | |
| parent | 04ee8253464734467743aabbb2d917e3fc5b0975 (diff) | |
Merge "Add @Nullable and @NonNull to module API" am: 04ee825346
Change-Id: I61943d8e33dc94d780401448a8acc716966a5763
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/annotation/NonNull.java | 9 | ||||
| -rw-r--r-- | core/java/android/annotation/Nullable.java | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/core/java/android/annotation/NonNull.java b/core/java/android/annotation/NonNull.java index 927f9975b3eb..a95bf3b8061e 100644 --- a/core/java/android/annotation/NonNull.java +++ b/core/java/android/annotation/NonNull.java @@ -15,14 +15,16 @@ */ package android.annotation; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.SOURCE; +import android.annotation.SystemApi.Client; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + /** * Denotes that a parameter, field or method return value can never be null. * <p> @@ -34,5 +36,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; */ @Retention(SOURCE) @Target({METHOD, PARAMETER, FIELD}) +@SystemApi(client = Client.MODULE_LIBRARIES) public @interface NonNull { } diff --git a/core/java/android/annotation/Nullable.java b/core/java/android/annotation/Nullable.java index b60170b134e1..2fcddfab9375 100644 --- a/core/java/android/annotation/Nullable.java +++ b/core/java/android/annotation/Nullable.java @@ -15,14 +15,16 @@ */ package android.annotation; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.SOURCE; +import android.annotation.SystemApi.Client; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + /** * Denotes that a parameter, field or method return value can be null. * <p> @@ -41,5 +43,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; */ @Retention(SOURCE) @Target({METHOD, PARAMETER, FIELD}) +@SystemApi(client = Client.MODULE_LIBRARIES) public @interface Nullable { } |