diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2020-12-15 17:36:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 17:36:13 +0000 |
| commit | 7a0acb4d348de40e1019be9661ffe023f15e6b3d (patch) | |
| tree | f502aaacbfabeb87505573c6f6b22a122c9b255e /core/java | |
| parent | ace8f705bcfe18de3f3d125734b21d579ba4376e (diff) | |
| parent | 3a76c4c9aaf799b559ebff5be64a18866fc2dcfb (diff) | |
Merge "Make Class.getPackageName public." am: 3a76c4c9aa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519502
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id82c4473902d0ca0ae31b4c7b7d4c9939bfe0bc6
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/util/AnnotationValidations.java | 4 |
1 files changed, 2 insertions, 2 deletions
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); |