Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a0acb4d authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Automerger Merge Worker
Browse files

Merge "Make Class.getPackageName public." am: 3a76c4c9 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id82c4473902d0ca0ae31b4c7b7d4c9939bfe0bc6
parents ace8f705 3a76c4c9

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);

core/java/com/android/internal/util/AnnotationValidations.java

+2 −2
Original line number Diff line number Diff line
@@ -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);