Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2db76a07 authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

resolve merge conflicts of 0fc2ec4e to master 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I393649fb7e6357b0190a55626aeb9ce4d21785a3
parents ae739a05 0fc2ec4e

config/hiddenapi-light-greylist.txt

+2 −0
Original line number Diff line number Diff line
@@ -7998,6 +7998,7 @@ Lcom/android/org/conscrypt/TrustedCertificateStore;->getCertificateChain(Ljava/s 
Lcom/android/org/conscrypt/TrustManagerImpl;-><init>(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$BlockGuardPolicyException;-><init>(IILjava/lang/String;)V
@@ -8043,6 +8044,7 @@ 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