Merge "Switch implicit hidden api methods to use UnsupportedAppUsage"

am: cb92ecc128

Change-Id: I740ce0b106e4c85b584352cf1f3dbd8e73e8c6c7

3 files changed, 20 insertions, 20 deletions

diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
index dfed4561..f494f475 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
@@ -394,6 +394,7 @@ public class PhoneNumberUtil {
    * use the PhoneNumber class.
    * @hide This class is not part of the Android public SDK API
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage(implicitMember = "values()[Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat;")
   public enum PhoneNumberFormat {
     @dalvik.annotation.compat.UnsupportedAppUsage
     E164,
@@ -409,6 +410,7 @@ public class PhoneNumberUtil {
    * Type of phone numbers.
    * @hide This class is not part of the Android public SDK API
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage(implicitMember = "values()[Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;")
   public enum PhoneNumberType {
     @dalvik.annotation.compat.UnsupportedAppUsage
     FIXED_LINE,
@@ -454,6 +456,7 @@ public class PhoneNumberUtil {
    * Types of phone number matches. See detailed description beside the isNumberMatch() method.
    * @hide This class is not part of the Android public SDK API
    */
+  @dalvik.annotation.compat.UnsupportedAppUsage(implicitMember = "values()[Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType;")
   public enum MatchType {
     @dalvik.annotation.compat.UnsupportedAppUsage
     NOT_A_NUMBER,
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonenumber.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonenumber.java
index dbdb1d23..fca9467e 100644
--- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonenumber.java
+++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/Phonenumber.java
@@ -38,6 +38,7 @@ public final class Phonenumber {
     /**
      * @hide This class is not part of the Android public SDK API
      */
+    @dalvik.annotation.compat.UnsupportedAppUsage(implicitMember = "values()[Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource;")
     public enum CountryCodeSource {
       @dalvik.annotation.compat.UnsupportedAppUsage
       FROM_NUMBER_WITH_PLUS_SIGN,
diff --git a/srcgen/unsupported-app-usage.json b/srcgen/unsupported-app-usage.json
index d7cace6f..823f4e13 100644
--- a/srcgen/unsupported-app-usage.json
+++ b/srcgen/unsupported-app-usage.json
@@ -88,11 +88,10 @@
   {
     "@location": "enumConstant:com.android.i18n.phonenumbers.Phonenumber$PhoneNumber$CountryCodeSource#FROM_NUMBER_WITH_PLUS_SIGN"
   },
-  // Synthetic enum methods cannot yet be handled using annotations and so are maintained in the
-  // frameworks/base/config/hiddenapi-light-greylist.txt
-  // {
-  //   "@location": "method:com.android.i18n.phonenumbers.Phonenumber$PhoneNumber$CountryCodeSource#val2ues()"
-  // },
+  {
+    "@location": "type:com.android.i18n.phonenumbers.Phonenumber$PhoneNumber$CountryCodeSource",
+    "implicitMember": "values()[Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource;"
+  },
   {
     "@location": "method:com.android.i18n.phonenumbers.Phonenumber$PhoneNumber#clearCountryCode()"
   },
@@ -144,11 +143,10 @@
   {
     "@location": "enumConstant:com.android.i18n.phonenumbers.PhoneNumberUtil$MatchType#SHORT_NSN_MATCH"
   },
-  // Synthetic enum methods cannot yet be handled using annotations and so are maintained in the
-  // frameworks/base/config/hiddenapi-light-greylist.txt
-  // {
-  //   "@location": "method:com.android.i18n.phonenumbers.PhoneNumberUtil$MatchType#values()"
-  // },
+  {
+    "@location": "type:com.android.i18n.phonenumbers.PhoneNumberUtil$MatchType",
+    "implicitMember": "values()[Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType;"
+  },
   {
     "@location": "enumConstant:com.android.i18n.phonenumbers.PhoneNumberUtil$PhoneNumberFormat#E164"
   },
@@ -161,11 +159,10 @@
   {
     "@location": "enumConstant:com.android.i18n.phonenumbers.PhoneNumberUtil$PhoneNumberFormat#RFC3966"
   },
-  // Synthetic enum methods cannot yet be handled using annotations and so are maintained in the
-  // frameworks/base/config/hiddenapi-light-greylist.txt
-  // {
-  //   "@location": "method:com.android.i18n.phonenumbers.PhoneNumberUtil$PhoneNumberFormat#values()"
-  // },
+  {
+    "@location": "type:com.android.i18n.phonenumbers.PhoneNumberUtil$PhoneNumberFormat",
+    "implicitMember": "values()[Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat;"
+  },
   {
     "@location": "enumConstant:com.android.i18n.phonenumbers.PhoneNumberUtil$PhoneNumberType#FIXED_LINE"
   },
@@ -193,11 +190,10 @@
   {
     "@location": "enumConstant:com.android.i18n.phonenumbers.PhoneNumberUtil$PhoneNumberType#UAN"
   },
-  // Synthetic enum methods cannot yet be handled using annotations and so are maintained in the
-  // frameworks/base/config/hiddenapi-light-greylist.txt
-  // {
-  //   "@location": "method:com.android.i18n.phonenumbers.PhoneNumberUtil$PhoneNumberType#values()"
-  // },
+  {
+    "@location": "type:com.android.i18n.phonenumbers.PhoneNumberUtil$PhoneNumberType",
+    "implicitMember": "values()[Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;"
+  },
   {
     "@location": "enumConstant:com.android.i18n.phonenumbers.PhoneNumberUtil$PhoneNumberType#VOICEMAIL"
   },