From 34a06b86bd6d35133e0a3cd1f44ce8cde709c70e Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Wed, 9 May 2018 18:02:03 +0100 Subject: [PATCH] Greylist hidden methods for exempting trusted test code Bug: 64382372 Test: N/A Merged-In: I8bcc3d23d0b942e70a16a9d28ea0d21ce4fe75a2 Change-Id: I8bcc3d23d0b942e70a16a9d28ea0d21ce4fe75a2 (cherry picked from commit 0e348c5013b37843302fb2d3c558fd7961c592a4) --- config/hiddenapi-light-greylist.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 96c3f85ba1a2..290651cb6d08 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -4105,6 +4105,7 @@ Lcom/android/org/conscrypt/OpenSSLX509Certificate;->mContext:J Lcom/android/org/conscrypt/TrustManagerImpl;->(Ljava/security/KeyStore;)V Lcom/android/org/conscrypt/TrustManagerImpl;->checkServerTrusted([Ljava/security/cert/X509Certificate;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List; Ldalvik/system/BaseDexClassLoader;->addDexPath(Ljava/lang/String;)V +Ldalvik/system/BaseDexClassLoader;->addDexPath(Ljava/lang/String;Z)V Ldalvik/system/BaseDexClassLoader;->getLdLibraryPath()Ljava/lang/String; Ldalvik/system/BaseDexClassLoader;->pathList:Ldalvik/system/DexPathList; Ldalvik/system/BlockGuard$Policy;->onNetwork()V @@ -4145,6 +4146,10 @@ Ldalvik/system/DexPathList;->nativeLibraryDirectories:Ljava/util/List; Ldalvik/system/DexPathList;->nativeLibraryPathElements:[Ldalvik/system/DexPathList$NativeLibraryElement; Ldalvik/system/DexPathList;->splitPaths(Ljava/lang/String;Z)Ljava/util/List; Ldalvik/system/DexPathList;->systemNativeLibraryDirectories:Ljava/util/List; +Ldalvik/system/SocketTagger;->get()Ldalvik/system/SocketTagger; +Ldalvik/system/SocketTagger;->tag(Ljava/net/Socket;)V +Ldalvik/system/SocketTagger;->untag(Ljava/net/Socket;)V +Ldalvik/system/VMDebug;->allowHiddenApiReflectionFrom(Ljava/lang/Class;)V Ldalvik/system/VMDebug;->dumpReferenceTables()V Ldalvik/system/VMDebug;->isDebuggerConnected()Z Ldalvik/system/VMRuntime;->addressOf(Ljava/lang/Object;)J