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

Commit 17069e40 authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

Make Class.getPackageName public. 

Test: m
Change-Id: I358db3d7e95c0ae700f9a7b2820e5324de2258d8
parent 294dd8f1

core/api/current.txt

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

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

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