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

Merge "Make Class.getPackageName public." am: 3a76c4c9aa am: 7a0acb4d34

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia30633196eef2c2fdbebde3ad87c9e19c3c8b58e
This commit is contained in:
Nicolas Geoffray
2020-12-15 18:28:30 +00:00
committed by Automerger Merge Worker
parent 1a55495ae9 7a0acb4d34
commit df634d7c4e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -57317,6 +57317,7 @@ package java.lang {
method public int getModifiers(); method public int getModifiers();
method @NonNull public String getName(); method @NonNull public String getName();
method @Nullable public Package getPackage(); method @Nullable public Package getPackage();
method @NonNull public String getPackageName();
method @Nullable public java.security.ProtectionDomain getProtectionDomain(); method @Nullable public java.security.ProtectionDomain getProtectionDomain();
method @Nullable public java.net.URL getResource(@NonNull String); method @Nullable public java.net.URL getResource(@NonNull String);
method @Nullable public java.io.InputStream getResourceAsStream(@NonNull String); method @Nullable public java.io.InputStream getResourceAsStream(@NonNull String);

4
core/java/com/android/internal/util/AnnotationValidations.java
View File

@@ -182,7 +182,7 @@ public class AnnotationValidations {
Annotation ignored, int value, Object... params) {} Annotation ignored, int value, Object... params) {}
public static void validate(Class<? extends Annotation> annotation, public static void validate(Class<? extends Annotation> annotation,
Annotation ignored, int value) { Annotation ignored, int value) {
if (("android.annotation".equals(annotation.getPackageName$()) if (("android.annotation".equals(annotation.getPackageName())
&& annotation.getSimpleName().endsWith("Res")) && annotation.getSimpleName().endsWith("Res"))
|| ColorInt.class.equals(annotation)) { || ColorInt.class.equals(annotation)) {
if (value < 0) { if (value < 0) {
@@ -192,7 +192,7 @@ public class AnnotationValidations {
} }
public static void validate(Class<? extends Annotation> annotation, public static void validate(Class<? extends Annotation> annotation,
Annotation ignored, long value) { Annotation ignored, long value) {
if ("android.annotation".equals(annotation.getPackageName$()) if ("android.annotation".equals(annotation.getPackageName())
&& annotation.getSimpleName().endsWith("Long")) { && annotation.getSimpleName().endsWith("Long")) {
if (value < 0L) { if (value < 0L) {
invalid(annotation, value); invalid(annotation, value);