From 352956b07e1cd5d7bdc3f3e747679fa49859f8ee Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 7 Dec 2018 11:52:19 +0000 Subject: [PATCH] Switch last c.a.i18n.phonenumbers hiddenapi entries to annotations Previous changes could not remove these entries as they are implicit methods, i.e. are not present in the source, and so could not be annotated. That is no longer true and so these entries can now be removed. This was tested by making and then manually checking that the generated out/target/common/obj/PACKAGING/hiddenapi-light-greylist.txt was the same (after sorting) before and after this change. Bug: 117818301 Bug: 119861512 Test: as above Change-Id: Ic33c693f50cac011332c5ba5a5c0e2b6562e6ef8 --- config/hiddenapi-greylist.txt | 4 ---- tools/hiddenapi/exclude.sh | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config/hiddenapi-greylist.txt b/config/hiddenapi-greylist.txt index 1488b0964fe8d..2aeb4310733e8 100644 --- a/config/hiddenapi-greylist.txt +++ b/config/hiddenapi-greylist.txt @@ -1716,10 +1716,6 @@ Landroid/widget/QuickContactBadge$QueryHandler;->(Landroid/widget/QuickCon Landroid/widget/RelativeLayout$DependencyGraph$Node;->()V Landroid/widget/RemoteViews$OnClickHandler;->()V Landroid/widget/ScrollBarDrawable;->()V -Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource;->values()[Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType;->values()[Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat;->values()[Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;->values()[Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; Lcom/android/ims/ImsCall;->deflect(Ljava/lang/String;)V Lcom/android/ims/ImsCall;->isMultiparty()Z Lcom/android/ims/ImsCall;->reject(I)V diff --git a/tools/hiddenapi/exclude.sh b/tools/hiddenapi/exclude.sh index 2291e5a927303..4ffcf68469479 100755 --- a/tools/hiddenapi/exclude.sh +++ b/tools/hiddenapi/exclude.sh @@ -11,6 +11,7 @@ LIBCORE_PACKAGES="\ android.system \ com.android.bouncycastle \ com.android.conscrypt \ + com.android.i18n.phonenumbers \ com.android.okhttp \ com.sun \ dalvik \