Merge "Add serialization methods to hidden API light greylist" into pi-dev (02175b78) · Commits · e / os / android_frameworks_base

Android.mk

+18 −2

Original line number	Diff line number	Diff line
		@@ -869,11 +869,27 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
		$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-blacklist.txt,\
		$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)))

		# Automatically add all methods which match the following signatures.
		# These need to be greylisted in order to allow applications to write their
		# own serializers.
		$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): REGEX_SERIALIZATION := \
		"readObject$Ljava/io/ObjectInputStream;$V" \
		"readObjectNoDataV" \
		"readResolveLjava/lang/Object;" \
		"serialVersionUID:J" \
		"serialPersistentFields:\[Ljava/io/ObjectStreamField;" \
		"writeObject$Ljava/io/ObjectOutputStream;$V" \
		"writeReplaceLjava/lang/Object;"
		$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)
		# Temporarily merge light greylist from two files. Vendor list will become dark
		# grey once we remove the UI toast.
		$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): frameworks/base/config/hiddenapi-light-greylist.txt \
		frameworks/base/config/hiddenapi-vendor-list.txt
		sort $^ > $@
		frameworks/base/config/hiddenapi-vendor-list.txt \
		$(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)
		sort frameworks/base/config/hiddenapi-light-greylist.txt \
		frameworks/base/config/hiddenapi-vendor-list.txt \
		<(grep -E "\->("$(subst $(space),"\|",$(REGEX_SERIALIZATION))")$$" $(PRIVATE_API)) \
		> $@

		# Generate dark greylist as private API minus (blacklist plus light greylist).

config/hiddenapi-light-greylist.txt

+0 −208

Original line number	Diff line number	Diff line
		@@ -822,56 +822,24 @@ Landroid/hardware/usb/UsbRequest;->mBuffer:Ljava/nio/ByteBuffer;
		Landroid/hardware/usb/UsbRequest;->mLength:I
		Landroid/hardware/usb/UsbRequest;->mNativeContext:J
		Landroid/icu/impl/CurrencyData;-><init>()V
		Landroid/icu/impl/number/DecimalFormatProperties;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/impl/number/DecimalFormatProperties;->writeObject(Ljava/io/ObjectOutputStream;)V
		Landroid/icu/impl/TimeZoneGenericNames;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/ArabicShaping;->isAlefMaksouraChar(C)Z
		Landroid/icu/text/ArabicShaping;->isSeenTailFamilyChar(C)I
		Landroid/icu/text/ArabicShaping;->isTailChar(C)Z
		Landroid/icu/text/ArabicShaping;->isYehHamzaChar(C)Z
		Landroid/icu/text/DateFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/DateFormatSymbols;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale;
		Landroid/icu/text/DateFormatSymbols;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/DateIntervalFormat;-><init>()V
		Landroid/icu/text/DateIntervalFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/DateTimePatternGenerator$DistanceInfo;-><init>()V
		Landroid/icu/text/DecimalFormat_ICU58_Android;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/DecimalFormat_ICU58_Android;->writeObject(Ljava/io/ObjectOutputStream;)V
		Landroid/icu/text/DecimalFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/DecimalFormatSymbols;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale;
		Landroid/icu/text/DecimalFormatSymbols;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/DecimalFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
		Landroid/icu/text/MessageFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/MessageFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
		Landroid/icu/text/NumberFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/NumberFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
		Landroid/icu/text/PluralFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/PluralRules$FixedDecimal;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/PluralRules$FixedDecimal;->writeObject(Ljava/io/ObjectOutputStream;)V
		Landroid/icu/text/PluralRules;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/PluralRules;->writeObject(Ljava/io/ObjectOutputStream;)V
		Landroid/icu/text/RuleBasedCollator;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale;
		Landroid/icu/text/RuleBasedNumberFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/RuleBasedNumberFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
		Landroid/icu/text/SelectFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/SimpleDateFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/SimpleDateFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
		Landroid/icu/text/SpoofChecker$ScriptSet;->and(I)V
		Landroid/icu/text/SpoofChecker$ScriptSet;-><init>()V
		Landroid/icu/text/SpoofChecker$ScriptSet;->isFull()Z
		Landroid/icu/text/SpoofChecker$ScriptSet;->setAll()V
		Landroid/icu/text/TimeZoneFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/text/TimeZoneFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
		Landroid/icu/text/TimeZoneNames$DefaultTimeZoneNames$FactoryImpl;-><init>()V
		Landroid/icu/text/Transliterator;->createFromRules(Ljava/lang/String;Ljava/lang/String;I)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/util/Calendar;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale;
		Landroid/icu/util/Calendar;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/util/Calendar;->writeObject(Ljava/io/ObjectOutputStream;)V
		Landroid/icu/util/ChineseCalendar;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/util/IslamicCalendar;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/icu/util/SimpleTimeZone;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/inputmethodservice/InputMethodService;->mExtractEditText:Landroid/inputmethodservice/ExtractEditText;
		Landroid/location/CountryDetector;->detectCountry()Landroid/location/Country;
		Landroid/location/Country;->getCountryIso()Ljava/lang/String;
		@@ -1989,7 +1957,6 @@ Landroid/util/Pools$SynchronizedPool;->acquire()Ljava/lang/Object;
		Landroid/util/Pools$SynchronizedPool;-><init>(I)V
		Landroid/util/Rational;->mDenominator:I
		Landroid/util/Rational;->mNumerator:I
		Landroid/util/Rational;->readObject(Ljava/io/ObjectInputStream;)V
		Landroid/util/Singleton;->mInstance:Ljava/lang/Object;
		Landroid/util/Slog;->d(Ljava/lang/String;Ljava/lang/String;)I
		Landroid/util/SparseIntArray;->mKeys:[I
		@@ -2838,8 +2805,6 @@ Lcom/android/okhttp/OkHttpClient;->DEFAULT_PROTOCOLS:Ljava/util/List;
		Lcom/android/okhttp/OkHttpClient;->dns:Lcom/android/okhttp/Dns;
		Lcom/android/okhttp/OkHttpClient;->setProtocols(Ljava/util/List;)Lcom/android/okhttp/OkHttpClient;
		Lcom/android/okhttp/OkHttpClient;->setRetryOnConnectionFailure(Z)V
		Lcom/android/okhttp/okio/ByteString;->readObject(Ljava/io/ObjectInputStream;)V
		Lcom/android/okhttp/okio/ByteString;->writeObject(Ljava/io/ObjectOutputStream;)V
		Lcom/android/okhttp/Request;->headers:Lcom/android/okhttp/Headers;
		Lcom/android/okhttp/Request;->method:Ljava/lang/String;
		Lcom/android/okhttp/Request;->url:Lcom/android/okhttp/HttpUrl;
		@@ -2942,20 +2907,14 @@ Ldalvik/system/VMRuntime;->vmInstructionSet()Ljava/lang/String;
		Ldalvik/system/VMRuntime;->vmLibrary()Ljava/lang/String;
		Ldalvik/system/VMStack;->getCallingClassLoader()Ljava/lang/ClassLoader;
		Ldalvik/system/VMStack;->getStackClass2()Ljava/lang/Class;
		Ljava/awt/font/NumericShaper;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/beans/PropertyChangeSupport;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/beans/PropertyChangeSupport;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/io/FileDescriptor;->descriptor:I
		Ljava/io/FileDescriptor;->getInt$()I
		Ljava/io/FileDescriptor;->setInt$(I)V
		Ljava/io/FileInputStream;->fd:Ljava/io/FileDescriptor;
		Ljava/io/FileOutputStream;->fd:Ljava/io/FileDescriptor;
		Ljava/io/File;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/io/File;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/io/ObjectStreamClass;->getConstructorId(Ljava/lang/Class;)J
		Ljava/io/ObjectStreamClass;->newInstance(Ljava/lang/Class;J)Ljava/lang/Object;
		Ljava/io/ObjectStreamClass;->newInstance()Ljava/lang/Object;
		Ljava/io/UncheckedIOException;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/lang/AbstractStringBuilder;->value:[C
		Ljava/lang/Boolean;->value:Z
		Ljava/lang/Byte;->value:B
		@@ -2976,11 +2935,8 @@ Ljava/lang/Daemons;->requestHeapTrim()V
		Ljava/lang/Daemons;->start()V
		Ljava/lang/Daemons;->stop()V
		Ljava/lang/Double;->value:D
		Ljava/lang/Enum;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/lang/Float;->value:F
		Ljava/lang/Integer;->value:I
		Ljava/lang/invoke/MethodType;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/lang/invoke/MethodType;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/lang/Long;->value:J
		Ljava/lang/ref/FinalizerReference;->add(Ljava/lang/Object;)V
		Ljava/lang/ref/FinalizerReference;->head:Ljava/lang/ref/FinalizerReference;
		@@ -2996,10 +2952,6 @@ Ljava/lang/Runtime;->loadLibrary(Ljava/lang/String;Ljava/lang/ClassLoader;)V
		Ljava/lang/Runtime;->load(Ljava/lang/String;Ljava/lang/ClassLoader;)V
		Ljava/lang/Runtime;->nativeLoad(Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/String;
		Ljava/lang/Short;->value:S
		Ljava/lang/StringBuffer;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/lang/StringBuffer;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/lang/StringBuilder;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/lang/StringBuilder;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/lang/String;-><init>(II[C)V
		Ljava/lang/System;-><init>()V
		Ljava/lang/Thread;->daemon:Z
		@@ -3023,16 +2975,9 @@ Ljava/lang/Throwable;->backtrace:Ljava/lang/Object;
		Ljava/lang/Throwable;->cause:Ljava/lang/Throwable;
		Ljava/lang/Throwable;->detailMessage:Ljava/lang/String;
		Ljava/lang/Throwable;->nativeFillInStackTrace()Ljava/lang/Object;
		Ljava/lang/Throwable;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/lang/Throwable;->stackTrace:[Ljava/lang/StackTraceElement;
		Ljava/lang/Throwable;->suppressedExceptions:Ljava/util/List;
		Ljava/lang/Throwable;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/lang/Void;-><init>()V
		Ljava/math/BigDecimal;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/math/BigDecimal;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/math/BigInteger;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/math/BigInteger;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/math/MathContext;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/net/Authenticator;->theAuthenticator:Ljava/net/Authenticator;
		Ljava/net/DatagramSocket;->impl:Ljava/net/DatagramSocketImpl;
		Ljava/net/HttpCookie;->httpOnly:Z
		@@ -3044,8 +2989,6 @@ Ljava/net/Inet6Address$Inet6AddressHolder;->scope_id:I
		Ljava/net/Inet6Address$Inet6AddressHolder;->scope_id_set:Z
		Ljava/net/Inet6Address$Inet6AddressHolder;->scope_ifname:Ljava/net/NetworkInterface;
		Ljava/net/Inet6Address;-><init>()V
		Ljava/net/Inet6Address;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/net/Inet6Address;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/net/InetAddress;->clearDnsCache()V
		Ljava/net/InetAddress;->holder:Ljava/net/InetAddress$InetAddressHolder;
		Ljava/net/InetAddress$InetAddressHolder;->address:I
		@@ -3054,19 +2997,11 @@ Ljava/net/InetAddress$InetAddressHolder;->hostName:Ljava/lang/String;
		Ljava/net/InetAddress$InetAddressHolder;->originalHostName:Ljava/lang/String;
		Ljava/net/InetAddress;->isNumeric(Ljava/lang/String;)Z
		Ljava/net/InetAddress;->parseNumericAddress(Ljava/lang/String;)Ljava/net/InetAddress;
		Ljava/net/InetAddress;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/net/InetAddress;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/net/InetSocketAddress;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/net/InetSocketAddress;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/net/Socket;->getFileDescriptor$()Ljava/io/FileDescriptor;
		Ljava/net/Socket;->impl:Ljava/net/SocketImpl;
		Ljava/net/URI;->host:Ljava/lang/String;
		Ljava/net/URI;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/net/URI;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/net/URL;->handler:Ljava/net/URLStreamHandler;
		Ljava/net/URL;->handlers:Ljava/util/Hashtable;
		Ljava/net/URL;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/net/URL;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/nio/Buffer;->address:J
		Ljava/nio/Buffer;->capacity:I
		Ljava/nio/Buffer;->_elementSizeShift:I
		@@ -3077,168 +3012,37 @@ Ljava/nio/ByteBuffer;->isReadOnly:Z
		Ljava/nio/ByteBuffer;->offset:I
		Ljava/nio/charset/CharsetEncoder;->canEncode(Ljava/nio/CharBuffer;)Z
		Ljava/nio/DirectByteBuffer;-><init>(JI)V
		Ljava/nio/file/DirectoryIteratorException;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/nio/NIOAccess;->getBaseArray(Ljava/nio/Buffer;)Ljava/lang/Object;
		Ljava/nio/NIOAccess;->getBaseArrayOffset(Ljava/nio/Buffer;)I
		Ljava/nio/NIOAccess;->getBasePointer(Ljava/nio/Buffer;)J
		Ljava/security/cert/CertificateRevokedException;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/security/cert/CertificateRevokedException;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/security/cert/CertPathValidatorException;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/security/CodeSigner;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/security/GuardedObject;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/security/Provider;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/security/SignedObject;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/security/spec/ECParameterSpec;->getCurveName()Ljava/lang/String;
		Ljava/security/spec/ECParameterSpec;->setCurveName(Ljava/lang/String;)V
		Ljava/security/Timestamp;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/text/ChoiceFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/text/DateFormat;->is24Hour:Ljava/lang/Boolean;
		Ljava/text/DateFormatSymbols;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/text/DateFormatSymbols;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/text/DecimalFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/text/DecimalFormatSymbols;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/text/DecimalFormatSymbols;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/text/DecimalFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/text/MessageFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/text/NumberFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/text/NumberFormat;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/text/SimpleDateFormat;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/chrono/AbstractChronology;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/chrono/HijrahChronology;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/chrono/HijrahDate;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/chrono/IsoChronology;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/chrono/JapaneseChronology;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/chrono/JapaneseDate;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/chrono/JapaneseEra;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/chrono/MinguoChronology;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/chrono/MinguoDate;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/chrono/ThaiBuddhistChronology;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/chrono/ThaiBuddhistDate;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/Duration;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/Duration;->toSeconds()Ljava/math/BigDecimal;
		Ljava/time/Instant;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/LocalDate;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/LocalDateTime;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/LocalTime;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/MonthDay;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/OffsetDateTime;-><init>(Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;)V
		Ljava/time/OffsetDateTime;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/OffsetTime;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/Period;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/temporal/ValueRange;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/temporal/WeekFields;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/YearMonth;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/Year;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/ZonedDateTime;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/ZoneId;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/ZoneOffset;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/zone/ZoneOffsetTransition;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/zone/ZoneOffsetTransitionRule;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/time/zone/ZoneRules;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/ArrayDeque;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/ArrayDeque;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/ArrayList;->elementData:[Ljava/lang/Object;
		Ljava/util/ArrayList;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/ArrayList;->size:I
		Ljava/util/ArrayList$SubList;->parent:Ljava/util/AbstractList;
		Ljava/util/ArrayList$SubList;->parentOffset:I
		Ljava/util/ArrayList$SubList;->size:I
		Ljava/util/ArrayList;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/Arrays$ArrayList;->a:[Ljava/lang/Object;
		Ljava/util/BitSet;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/BitSet;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/Calendar;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/Calendar;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/Calendar;->zone:Ljava/util/TimeZone;
		Ljava/util/Collections$EmptyList;-><init>()V
		Ljava/util/Collections$SetFromMap;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/Collections$SynchronizedCollection;->c:Ljava/util/Collection;
		Ljava/util/Collections$SynchronizedCollection;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/Collections$SynchronizedMap;->m:Ljava/util/Map;
		Ljava/util/Collections$SynchronizedMap;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/Collections$UnmodifiableCollection;->c:Ljava/util/Collection;
		Ljava/util/Collections$UnmodifiableMap;->m:Ljava/util/Map;
		Ljava/util/concurrent/atomic/AtomicReferenceArray;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/atomic/DoubleAccumulator;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/atomic/DoubleAdder;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/atomic/LongAccumulator;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/atomic/LongAdder;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/ConcurrentHashMap$BaseIterator;->hasMoreElements()Z
		Ljava/util/concurrent/ConcurrentHashMap;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/ConcurrentHashMap;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/concurrent/ConcurrentLinkedDeque;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/ConcurrentLinkedDeque;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/concurrent/ConcurrentLinkedQueue;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/ConcurrentLinkedQueue;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/concurrent/ConcurrentSkipListMap;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/ConcurrentSkipListMap;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/concurrent/CopyOnWriteArrayList;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/CopyOnWriteArrayList;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/concurrent/ForkJoinTask;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/ForkJoinTask;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/concurrent/FutureTask;->callable:Ljava/util/concurrent/Callable;
		Ljava/util/concurrent/LinkedBlockingDeque;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/LinkedBlockingDeque;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/concurrent/LinkedBlockingQueue;->capacity:I
		Ljava/util/concurrent/LinkedBlockingQueue;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/LinkedBlockingQueue;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/concurrent/LinkedTransferQueue;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/LinkedTransferQueue;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/concurrent/locks/ReentrantLock$Sync;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/locks/ReentrantReadWriteLock$Sync;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/locks/StampedLock;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/PriorityBlockingQueue;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/PriorityBlockingQueue;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/concurrent/SynchronousQueue;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/concurrent/SynchronousQueue;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/concurrent/ThreadLocalRandom;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/Date;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/Date;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/EnumMap;->keyType:Ljava/lang/Class;
		Ljava/util/EnumMap;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/EnumMap;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/EnumSet;->elementType:Ljava/lang/Class;
		Ljava/util/EnumSet;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/GregorianCalendar;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/HashMap$HashIterator;->hasNext()Z
		Ljava/util/HashMap;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/HashMap;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/HashSet;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/HashSet;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/Hashtable;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/Hashtable;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/IdentityHashMap;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/IdentityHashMap;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/InvalidPropertiesFormatException;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/InvalidPropertiesFormatException;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/LinkedHashMap;->eldest()Ljava/util/Map$Entry;
		Ljava/util/LinkedHashMap$LinkedHashIterator;->hasNext()Z
		Ljava/util/LinkedList;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/LinkedList;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/Locale;->createConstant(Ljava/lang/String;Ljava/lang/String;)Ljava/util/Locale;
		Ljava/util/Locale;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/Locale;->readResolve()Ljava/lang/Object;
		Ljava/util/Locale;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/logging/LogRecord;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/logging/LogRecord;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/prefs/NodeChangeEvent;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/prefs/NodeChangeEvent;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/prefs/PreferenceChangeEvent;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/prefs/PreferenceChangeEvent;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/PriorityQueue;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/PriorityQueue;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/Random;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/Random;->seedUniquifier()J
		Ljava/util/Random;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/regex/Matcher;->appendPos:I
		Ljava/util/regex/Pattern;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/SimpleTimeZone;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/SimpleTimeZone;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/TreeMap;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/TreeMap;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/TreeSet;->readObject(Ljava/io/ObjectInputStream;)V
		Ljava/util/TreeSet;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/Vector;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljava/util/zip/Deflater;->buf:[B
		Ljava/util/zip/Deflater;->finished:Z
		Ljava/util/zip/Deflater;->finish:Z
		@@ -3254,23 +3058,11 @@ Ljava/util/zip/Inflater;->needDict:Z
		Ljava/util/zip/Inflater;->off:I
		Ljava/util/zip/ZipEntry;-><init>(Ljava/lang/String;Ljava/lang/String;JJJII[BJ)V
		Ljava/util/zip/ZipFile;->jzfile:J
		Ljavax/crypto/SealedObject;->readObject(Ljava/io/ObjectInputStream;)V
		Ljavax/net/ssl/SSLServerSocketFactory;->defaultServerSocketFactory:Ljavax/net/ssl/SSLServerSocketFactory;
		Ljavax/net/ssl/SSLSocketFactory;->defaultSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
		Ljavax/security/auth/Subject;->readObject(Ljava/io/ObjectInputStream;)V
		Ljavax/security/auth/Subject$SecureSet;->readObject(Ljava/io/ObjectInputStream;)V
		Ljavax/security/auth/Subject$SecureSet;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljavax/security/auth/Subject;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljavax/security/auth/x500/X500Principal;->readObject(Ljava/io/ObjectInputStream;)V
		Ljavax/security/auth/x500/X500Principal;->writeObject(Ljava/io/ObjectOutputStream;)V
		Ljavax/xml/datatype/DatatypeConfigurationException;->readObject(Ljava/io/ObjectInputStream;)V
		Ljavax/xml/namespace/QName;->readObject(Ljava/io/ObjectInputStream;)V
		Llibcore/util/ZoneInfo;->mTransitions:[J
		Llibcore/util/ZoneInfo;->readObject(Ljava/io/ObjectInputStream;)V
		Lorg/apache/http/conn/ssl/SSLSocketFactory;-><init>(Ljavax/net/ssl/SSLSocketFactory;)V
		Lorg/apache/http/conn/ssl/SSLSocketFactory;-><init>()V
		Lorg/json/JSONArray;->values:Ljava/util/List;
		Lorg/json/JSONObject;->writeTo(Lorg/json/JSONStringer;)V
		Lsun/misc/Unsafe;->theUnsafe:Lsun/misc/Unsafe;
		Lsun/security/util/ObjectIdentifier;->readObject(Ljava/io/ObjectInputStream;)V
		Lsun/security/util/ObjectIdentifier;->writeObject(Ljava/io/ObjectOutputStream;)V