diff options
| author | 2020-12-15 18:28:30 +0000 | |
|---|---|---|
| committer | 2020-12-15 18:28:30 +0000 | |
| commit | df634d7c4e2d59aa09ee430524b476b51aabc3d4 (patch) | |
| tree | 2a751a9ad3b87543844f4aa0de32c33b6682829f | |
| parent | 1a55495ae96b921d94a5bcd4ba1650be715fa248 (diff) | |
| parent | 7a0acb4d348de40e1019be9661ffe023f15e6b3d (diff) | |
Merge "Make Class.getPackageName public." am: 3a76c4c9aa am: 7a0acb4d34
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519502
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia30633196eef2c2fdbebde3ad87c9e19c3c8b58e
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/com/android/internal/util/AnnotationValidations.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 1ef98be04ecf..87fc6361983a 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -57317,6 +57317,7 @@ package java.lang { method public int getModifiers(); method @NonNull public String getName(); method @Nullable public Package getPackage(); + method @NonNull public String getPackageName(); method @Nullable public java.security.ProtectionDomain getProtectionDomain(); method @Nullable public java.net.URL getResource(@NonNull String); method @Nullable public java.io.InputStream getResourceAsStream(@NonNull String); diff --git a/core/java/com/android/internal/util/AnnotationValidations.java b/core/java/com/android/internal/util/AnnotationValidations.java index 2d3b45023c9d..cf5e48f9657f 100644 --- a/core/java/com/android/internal/util/AnnotationValidations.java +++ b/core/java/com/android/internal/util/AnnotationValidations.java @@ -182,7 +182,7 @@ public class AnnotationValidations { Annotation ignored, int value, Object... params) {} public static void validate(Class<? extends Annotation> annotation, Annotation ignored, int value) { - if (("android.annotation".equals(annotation.getPackageName$()) + if (("android.annotation".equals(annotation.getPackageName()) && annotation.getSimpleName().endsWith("Res")) || ColorInt.class.equals(annotation)) { if (value < 0) { @@ -192,7 +192,7 @@ public class AnnotationValidations { } public static void validate(Class<? extends Annotation> annotation, Annotation ignored, long value) { - if ("android.annotation".equals(annotation.getPackageName$()) + if ("android.annotation".equals(annotation.getPackageName()) && annotation.getSimpleName().endsWith("Long")) { if (value < 0L) { invalid(annotation, value); |