From dffafa5b66939e12c2eb4e8b5867b4bd82e2400c Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Tue, 8 May 2018 19:27:13 +0100 Subject: [PATCH] Greylist cloned SDK fields Doclava will expose a field from a hidden interface if it is inherited by an SDK class by temporarily creating a new FieldInfo object which pretends the field is in fact declared in the SDK class. This mechanism was missed by the routine which prints non-SDK APIs and the fields are considered non-SDK. Until this is fixed, put the affected fields on the light greylist to unblock CTS tests. Bug: 64382372 Bug: 73082683 Test: atest CtsCurrentApiSignatureTestCases Change-Id: Ic10d26b82ad8f324280e0198f1d3e8b0ab824d35 --- config/hiddenapi-light-greylist.txt | 154 ++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 1418012ec42d..3bfeb05d78b5 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -1125,6 +1125,42 @@ Landroid/graphics/Typeface;->mStyle:I Landroid/graphics/Typeface;->sDefaults:[Landroid/graphics/Typeface; Landroid/graphics/Typeface;->setDefault(Landroid/graphics/Typeface;)V Landroid/graphics/Typeface;->sSystemFontMap:Ljava/util/Map; +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ACQUIRED_GOOD:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ACQUIRED_IMAGER_DIRTY:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ACQUIRED_INSUFFICIENT:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ACQUIRED_PARTIAL:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ACQUIRED_TOO_FAST:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ACQUIRED_TOO_SLOW:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_CANCELED:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_HW_NOT_PRESENT:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_HW_UNAVAILABLE:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_LOCKOUT:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_LOCKOUT_PERMANENT:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_NO_BIOMETRICS:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_NO_SPACE:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_TIMEOUT:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_UNABLE_TO_PROCESS:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_USER_CANCELED:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_VENDOR:I +Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_VENDOR_BASE:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ACQUIRED_GOOD:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ACQUIRED_IMAGER_DIRTY:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ACQUIRED_INSUFFICIENT:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ACQUIRED_PARTIAL:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ACQUIRED_TOO_FAST:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ACQUIRED_TOO_SLOW:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_CANCELED:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_HW_NOT_PRESENT:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_HW_UNAVAILABLE:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_LOCKOUT:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_LOCKOUT_PERMANENT:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_NO_FINGERPRINTS:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_NO_SPACE:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_TIMEOUT:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_UNABLE_TO_PROCESS:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_USER_CANCELED:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_VENDOR:I +Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_VENDOR_BASE:I Landroid/hardware/camera2/CameraCharacteristics$Key;->(Ljava/lang/String;Landroid/hardware/camera2/utils/TypeReference;)V Landroid/hardware/camera2/CameraCharacteristics$Key;->(Ljava/lang/String;Ljava/lang/Class;)V Landroid/hardware/camera2/CameraCharacteristics$Key;->(Ljava/lang/String;Ljava/lang/Class;J)V @@ -1287,6 +1323,7 @@ Landroid/icu/text/Transliterator;->createFromRules(Ljava/lang/String;Ljava/lang/ Landroid/icu/text/Transliterator;->getInstance(Ljava/lang/String;)Landroid/icu/text/Transliterator; Landroid/icu/text/Transliterator;->transliterate(Ljava/lang/String;)Ljava/lang/String; Landroid/icu/text/UFormat;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale; +Landroid/icu/text/UForwardCharacterIterator;->DONE:I Landroid/icu/util/Calendar;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale; Landroid/inputmethodservice/InputMethodService$SettingsObserver;->shouldShowImeWithHardKeyboard()Z Landroid/inputmethodservice/InputMethodService;->mExtractEditText:Landroid/inputmethodservice/ExtractEditText; @@ -1491,6 +1528,80 @@ Landroid/media/SubtitleTrack$RenderingWidget;->setOnChangedListener(Landroid/med Landroid/media/SubtitleTrack$RenderingWidget;->setSize(II)V Landroid/media/ThumbnailUtils;->createImageThumbnail(Ljava/lang/String;I)Landroid/graphics/Bitmap; Landroid/media/ToneGenerator;->mNativeContext:J +Landroid/media/tv/TvContract$PreviewProgramColumns;->ASPECT_RATIO_16_9:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->ASPECT_RATIO_1_1:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->ASPECT_RATIO_2_3:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->ASPECT_RATIO_3_2:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->ASPECT_RATIO_4_3:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->AVAILABILITY_AVAILABLE:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->AVAILABILITY_FREE_WITH_SUBSCRIPTION:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->AVAILABILITY_PAID_CONTENT:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_AUTHOR:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_AVAILABILITY:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_BROWSABLE:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_CONTENT_ID:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_DURATION_MILLIS:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_INTENT_URI:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_INTERACTION_COUNT:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_INTERACTION_TYPE:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_INTERNAL_PROVIDER_ID:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_ITEM_COUNT:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_LAST_PLAYBACK_POSITION_MILLIS:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_LIVE:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_LOGO_URI:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_OFFER_PRICE:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_POSTER_ART_ASPECT_RATIO:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_PREVIEW_VIDEO_URI:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_RELEASE_DATE:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_STARTING_PRICE:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_THUMBNAIL_ASPECT_RATIO:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_TRANSIENT:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->COLUMN_TYPE:Ljava/lang/String; +Landroid/media/tv/TvContract$PreviewProgramColumns;->INTERACTION_TYPE_FANS:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->INTERACTION_TYPE_FOLLOWERS:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->INTERACTION_TYPE_LIKES:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->INTERACTION_TYPE_LISTENS:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->INTERACTION_TYPE_THUMBS:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->INTERACTION_TYPE_VIEWERS:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->INTERACTION_TYPE_VIEWS:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->TYPE_ALBUM:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->TYPE_ARTIST:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->TYPE_CHANNEL:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->TYPE_CLIP:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->TYPE_EVENT:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->TYPE_MOVIE:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->TYPE_PLAYLIST:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->TYPE_STATION:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->TYPE_TRACK:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->TYPE_TV_EPISODE:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->TYPE_TV_SEASON:I +Landroid/media/tv/TvContract$PreviewProgramColumns;->TYPE_TV_SERIES:I +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_AUDIO_LANGUAGE:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_CANONICAL_GENRE:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_CONTENT_RATING:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_EPISODE_DISPLAY_NUMBER:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_EPISODE_TITLE:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_INTERNAL_PROVIDER_DATA:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_INTERNAL_PROVIDER_FLAG1:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_INTERNAL_PROVIDER_FLAG2:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_INTERNAL_PROVIDER_FLAG3:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_INTERNAL_PROVIDER_FLAG4:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_LONG_DESCRIPTION:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_POSTER_ART_URI:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_REVIEW_RATING:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_REVIEW_RATING_STYLE:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_SEARCHABLE:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_SEASON_DISPLAY_NUMBER:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_SEASON_TITLE:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_SHORT_DESCRIPTION:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_THUMBNAIL_URI:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_TITLE:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_VERSION_NUMBER:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_VIDEO_HEIGHT:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->COLUMN_VIDEO_WIDTH:Ljava/lang/String; +Landroid/media/tv/TvContract$ProgramColumns;->REVIEW_RATING_STYLE_PERCENTAGE:I +Landroid/media/tv/TvContract$ProgramColumns;->REVIEW_RATING_STYLE_STARS:I +Landroid/media/tv/TvContract$ProgramColumns;->REVIEW_RATING_STYLE_THUMBS_UP_DOWN:I Landroid/media/VolumeShaper$Configuration;->(IIIDI[F[F)V Landroid/media/VolumeShaper$Configuration;->mDurationMs:D Landroid/media/VolumeShaper$Configuration;->mId:I @@ -2029,6 +2140,9 @@ Landroid/provider/Browser;->getVisitedHistory(Landroid/content/ContentResolver;) Landroid/provider/Browser;->sendString(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V Landroid/provider/CalendarContract$CalendarAlerts;->findNextAlarmTime(Landroid/content/ContentResolver;J)J Landroid/provider/CalendarContract$CalendarAlerts;->rescheduleMissedAlarms(Landroid/content/ContentResolver;Landroid/content/Context;Landroid/app/AlarmManager;)V +Landroid/provider/ContactsContract$ContactCounts;->EXTRA_ADDRESS_BOOK_INDEX:Ljava/lang/String; +Landroid/provider/ContactsContract$ContactCounts;->EXTRA_ADDRESS_BOOK_INDEX_COUNTS:Ljava/lang/String; +Landroid/provider/ContactsContract$ContactCounts;->EXTRA_ADDRESS_BOOK_INDEX_TITLES:Ljava/lang/String; Landroid/provider/Downloads$Impl$RequestHeaders;->INSERT_KEY_PREFIX:Ljava/lang/String; Landroid/provider/Downloads$Impl;->COLUMN_ALLOWED_NETWORK_TYPES:Ljava/lang/String; Landroid/provider/Downloads$Impl;->COLUMN_ALLOW_ROAMING:Ljava/lang/String; @@ -3996,6 +4110,46 @@ Ljava/util/zip/Inflater;->finished:Z Ljava/util/zip/Inflater;->len:I Ljava/util/zip/Inflater;->needDict:Z Ljava/util/zip/Inflater;->off:I +Ljava/util/zip/ZipConstants;->CENATT:I +Ljava/util/zip/ZipConstants;->CENATX:I +Ljava/util/zip/ZipConstants;->CENCOM:I +Ljava/util/zip/ZipConstants;->CENCRC:I +Ljava/util/zip/ZipConstants;->CENDSK:I +Ljava/util/zip/ZipConstants;->CENEXT:I +Ljava/util/zip/ZipConstants;->CENFLG:I +Ljava/util/zip/ZipConstants;->CENHDR:I +Ljava/util/zip/ZipConstants;->CENHOW:I +Ljava/util/zip/ZipConstants;->CENLEN:I +Ljava/util/zip/ZipConstants;->CENNAM:I +Ljava/util/zip/ZipConstants;->CENOFF:I +Ljava/util/zip/ZipConstants;->CENSIG:J +Ljava/util/zip/ZipConstants;->CENSIZ:I +Ljava/util/zip/ZipConstants;->CENTIM:I +Ljava/util/zip/ZipConstants;->CENVEM:I +Ljava/util/zip/ZipConstants;->CENVER:I +Ljava/util/zip/ZipConstants;->ENDCOM:I +Ljava/util/zip/ZipConstants;->ENDHDR:I +Ljava/util/zip/ZipConstants;->ENDOFF:I +Ljava/util/zip/ZipConstants;->ENDSIG:J +Ljava/util/zip/ZipConstants;->ENDSIZ:I +Ljava/util/zip/ZipConstants;->ENDSUB:I +Ljava/util/zip/ZipConstants;->ENDTOT:I +Ljava/util/zip/ZipConstants;->EXTCRC:I +Ljava/util/zip/ZipConstants;->EXTHDR:I +Ljava/util/zip/ZipConstants;->EXTLEN:I +Ljava/util/zip/ZipConstants;->EXTSIG:J +Ljava/util/zip/ZipConstants;->EXTSIZ:I +Ljava/util/zip/ZipConstants;->LOCCRC:I +Ljava/util/zip/ZipConstants;->LOCEXT:I +Ljava/util/zip/ZipConstants;->LOCFLG:I +Ljava/util/zip/ZipConstants;->LOCHDR:I +Ljava/util/zip/ZipConstants;->LOCHOW:I +Ljava/util/zip/ZipConstants;->LOCLEN:I +Ljava/util/zip/ZipConstants;->LOCNAM:I +Ljava/util/zip/ZipConstants;->LOCSIG:J +Ljava/util/zip/ZipConstants;->LOCSIZ:I +Ljava/util/zip/ZipConstants;->LOCTIM:I +Ljava/util/zip/ZipConstants;->LOCVER:I Ljava/util/zip/ZipEntry;->(Ljava/lang/String;Ljava/lang/String;JJJII[BJ)V Ljava/util/zip/ZipFile;->jzfile:J Ljavax/net/ssl/SSLServerSocketFactory;->defaultServerSocketFactory:Ljavax/net/ssl/SSLServerSocketFactory; -- 2.11.0