From 17069e403bfdbcd878e26ca7f52064f10425cf03 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Tue, 8 Dec 2020 14:29:02 +0000
Subject: [PATCH] Make Class.getPackageName public.

Test: m
Change-Id: I358db3d7e95c0ae700f9a7b2820e5324de2258d8
---
 core/api/current.txt                                          | 1 +
 .../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 b579d2cfc1db0..439bde72e3077 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -62097,6 +62097,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 2d3b45023c9d0..cf5e48f9657f3 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);