Merge "DO NOT MERGE: Drop prebuilt files to android source tree." into udc-qpr-dev

7 files changed, 240 insertions, 329 deletions

diff --git a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
index bfa824e..10d1f5f 100644
--- a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1007188"
+    build_id: "T1008598"
     target: "train_build"
     source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.tethering/sdk/tethering-module-sdk-current.zip"
   }
@@ -8,7 +8,7 @@ drops {
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/Connectivity"
-  git_branch: "udc-dev"
+  git_branch: "udc-qpr-dev"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/go/current/hiddenapi/filtered-flags.csv b/go/current/hiddenapi/filtered-flags.csv
index 8517709..da76133 100644
--- a/go/current/hiddenapi/filtered-flags.csv
+++ b/go/current/hiddenapi/filtered-flags.csv
@@ -225,7 +225,6 @@ Landroid/nearby/PairStatusMetadata$1;->createFromParcel(Landroid/os/Parcel;)Ljav
 Landroid/nearby/PairStatusMetadata$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/nearby/PairStatusMetadata;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/nearby/PairStatusMetadata;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/nearby/PairStatusMetadata;->getStability()I,sdk,system-api,test-api
 Landroid/nearby/PairStatusMetadata;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/nearby/PairStatusMetadata;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/nearby/PairStatusMetadata;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
@@ -2030,7 +2029,6 @@ Landroid/net/NetworkCapabilities;->DEFAULT_CAPABILITIES:J,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->LINK_BANDWIDTH_UNSPECIFIED:I,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->MAX_NET_CAPABILITY:I,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->MAX_TRANSPORT:I,lo-prio,max-target-o
-Landroid/net/NetworkCapabilities;->MIN_NET_CAPABILITY:I,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->MIN_TRANSPORT:I,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->MUTABLE_CAPABILITIES:J,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->NET_CAPABILITY_BIP:I,sdk,system-api,test-api
@@ -2356,9 +2354,14 @@ Landroid/net/NetworkStateSnapshot;->hashCode()I,core-platform-api,public-api,sdk
 Landroid/net/NetworkStateSnapshot;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStateSnapshot;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStats$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStats$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda4;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda6;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda7;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda8;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStats$1;->hasNext()Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStats$1;->next()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStats$2;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -3595,6 +3598,8 @@ Landroid/net/connectivity/org/chromium/net/AndroidNetworkLibrary$SocketFd$Socket
 Landroid/net/connectivity/org/chromium/net/AndroidNetworkLibrary$SocketFd$SocketImplFd;->listen(I)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/AndroidNetworkLibrary$SocketFd$SocketImplFd;->sendUrgentData(I)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/AndroidNetworkLibrary$SocketFd$SocketImplFd;->setOption(ILjava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/CronetEngine$Builder$1;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/CronetProvider;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/HttpNegotiateAuthenticator$GetAccountsCallback;->run(Landroid/accounts/AccountManagerFuture;)V,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/HttpNegotiateAuthenticator$GetTokenCallback$1;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/HttpNegotiateAuthenticator$GetTokenCallback;->run(Landroid/accounts/AccountManagerFuture;)V,public-api,sdk,system-api,test-api
@@ -3624,15 +3629,9 @@ Landroid/net/connectivity/org/chromium/net/ProxyChangeListener$$ExternalSyntheti
 Landroid/net/connectivity/org/chromium/net/ProxyChangeListener$ProxyConfig;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/ProxyChangeListener$ProxyReceiver$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/ProxyChangeListener$ProxyReceiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/UploadDataProvider;->close()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/X509Util$TrustStorageListener;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->build()Landroid/net/http/BidirectionalStream;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->setDelayRequestHeadersUntilFirstFlushEnabled(Z)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->setHttpMethod(Ljava/lang/String;)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->setPriority(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->setTrafficStatsTag(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->setTrafficStatsUid(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamNetworkException;->isImmediatelyRetryable()Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/apihelpers/UploadDataProviders$FileUploadProvider;->close()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -3640,30 +3639,12 @@ Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$4;->ru
 Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$5;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$OnReadCompletedRunnable;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$OnWriteCompletedRunnable;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->cancel()V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->flush()V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->getHttpMethod()Ljava/lang/String;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->getPriority()I,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->getTrafficStatsTag()I,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->getTrafficStatsUid()I,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->hasTrafficStatsTag()Z,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->hasTrafficStatsUid()Z,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->isDelayRequestHeadersUntilFirstFlushEnabled()Z,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->isDone()Z,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->read(Ljava/nio/ByteBuffer;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->start()V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->write(Ljava/nio/ByteBuffer;Z)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetEngineBase;->newUrlRequestBuilder(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/http/UrlRequest$Callback;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetLibraryLoader$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetLogger$CronetVersion;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/impl/CronetLoggerFactory$SwapLoggerForTesting;->close()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream$1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream$2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream$3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream;->onReadError(Ljava/lang/Exception;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream;->onReadSucceeded(Z)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream;->onRewindError(Ljava/lang/Exception;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream;->onRewindSucceeded()V,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -3674,104 +3655,27 @@ Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$7;->run()V,core
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$8;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$9;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$OnReadCompletedRunnable;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->cancel()V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->followRedirect()V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->getHttpMethod()Ljava/lang/String;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->getPriority()I,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->getStatus(Landroid/net/http/UrlRequest$StatusListener;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->getTrafficStatsTag()I,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->getTrafficStatsUid()I,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->hasTrafficStatsTag()Z,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->hasTrafficStatsUid()Z,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->isCacheDisabled()Z,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->isDirectExecutorAllowed()Z,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->isDone()Z,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->read(Ljava/nio/ByteBuffer;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->start()V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext$1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext$2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext;->bindToNetwork(Landroid/net/Network;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext;->createUrlStreamHandlerFactory()Ljava/net/URLStreamHandlerFactory;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext;->newBidirectionalStreamBuilder(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/http/BidirectionalStream$Callback;)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext;->openConnection(Ljava/net/URL;)Ljava/net/URLConnection;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext;->shutdown()V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/HeaderBlockImpl$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/HeaderBlockImpl$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/HeaderBlockImpl;->getAsList()Ljava/util/List;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/HeaderBlockImpl;->getAsMap()Ljava/util/Map;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/NetworkExceptionImpl;->getErrorCode()I,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext$3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext$4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/impl/NativeCronetProvider;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/impl/NativeCronetProvider;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/NetworkExceptionImpl;->getMessage()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/NetworkExceptionImpl;->isImmediatelyRetryable()Z,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/QuicExceptionImpl;->getErrorCode()I,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/QuicExceptionImpl;->getMessage()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/QuicExceptionImpl;->isImmediatelyRetryable()Z,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->bindToNetwork(Landroid/net/Network;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->build()Landroid/net/http/UrlRequest;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setCacheDisabled(Z)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setDirectExecutorAllowed(Z)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setHttpMethod(Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setPriority(I)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setTrafficStatsTag(I)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setTrafficStatsUid(I)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setUploadDataProvider(Landroid/net/http/UploadDataProvider;Ljava/util/concurrent/Executor;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getHttpStatusCode()I,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getHttpStatusText()Ljava/lang/String;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getNegotiatedProtocol()Ljava/lang/String;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getReceivedByteCount()J,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getUrl()Ljava/lang/String;,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getUrlChain()Ljava/util/List;,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->wasCached()Z,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onCanceled(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onFailed(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;Landroid/net/http/HttpException;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onReadCompleted(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;Ljava/nio/ByteBuffer;Z)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onResponseHeadersReceived(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onResponseTrailersReceived(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;Landroid/net/http/HeaderBlock;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onStreamReady(Landroid/net/http/BidirectionalStream;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onSucceeded(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onWriteCompleted(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;Ljava/nio/ByteBuffer;Z)V,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$NetworkQualityRttListenerWrapper;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$NetworkQualityRttListenerWrapper;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$NetworkQualityThroughputListenerWrapper;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$NetworkQualityThroughputListenerWrapper;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UploadDataProviderWrapper;->close()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UploadDataProviderWrapper;->getLength()J,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UploadDataProviderWrapper;->read(Landroid/net/http/UploadDataSink;Ljava/nio/ByteBuffer;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UploadDataProviderWrapper;->rewind(Landroid/net/http/UploadDataSink;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestCallback;->onCanceled(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestCallback;->onFailed(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;Landroid/net/http/HttpException;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestCallback;->onReadCompleted(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;Ljava/nio/ByteBuffer;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestCallback;->onRedirectReceived(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;Ljava/lang/String;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestCallback;->onResponseStarted(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestCallback;->onSucceeded(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestStatusListener;->onStatus(I)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetBufferedOutputStream$UploadDataProviderImpl;->getLength()J,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetBufferedOutputStream$UploadDataProviderImpl;->read(Landroid/net/http/UploadDataSink;Ljava/nio/ByteBuffer;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetBufferedOutputStream$UploadDataProviderImpl;->rewind(Landroid/net/http/UploadDataSink;)V,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetBufferedOutputStream;->write(I)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetBufferedOutputStream;->write([BII)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetChunkedOutputStream$UploadDataProviderImpl;->getLength()J,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetChunkedOutputStream$UploadDataProviderImpl;->read(Landroid/net/http/UploadDataSink;Ljava/nio/ByteBuffer;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetChunkedOutputStream$UploadDataProviderImpl;->rewind(Landroid/net/http/UploadDataSink;)V,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetChunkedOutputStream;->close()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetChunkedOutputStream;->write(I)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetChunkedOutputStream;->write([BII)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetFixedModeOutputStream$UploadDataProviderImpl;->getLength()J,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetFixedModeOutputStream$UploadDataProviderImpl;->read(Landroid/net/http/UploadDataSink;Ljava/nio/ByteBuffer;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetFixedModeOutputStream$UploadDataProviderImpl;->rewind(Landroid/net/http/UploadDataSink;)V,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetFixedModeOutputStream;->write(I)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetFixedModeOutputStream;->write([BII)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection$CronetUrlRequestCallback;->onCanceled(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection$CronetUrlRequestCallback;->onFailed(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;Landroid/net/http/HttpException;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection$CronetUrlRequestCallback;->onReadCompleted(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;Ljava/nio/ByteBuffer;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection$CronetUrlRequestCallback;->onRedirectReceived(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;Ljava/lang/String;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection$CronetUrlRequestCallback;->onResponseStarted(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;)V,public-api,sdk,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection$CronetUrlRequestCallback;->onSucceeded(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;)V,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection;->addRequestProperty(Ljava/lang/String;Ljava/lang/String;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection;->connect()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection;->disconnect()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -3833,6 +3737,27 @@ Landroid/net/http/BidirectionalStream;->isDone()Z,public-api,sdk,system-api,test
 Landroid/net/http/BidirectionalStream;->read(Ljava/nio/ByteBuffer;)V,public-api,sdk,system-api,test-api
 Landroid/net/http/BidirectionalStream;->start()V,public-api,sdk,system-api,test-api
 Landroid/net/http/BidirectionalStream;->write(Ljava/nio/ByteBuffer;Z)V,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->build()Landroid/net/http/BidirectionalStream;,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->setDelayRequestHeadersUntilFirstFlushEnabled(Z)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->setHttpMethod(Ljava/lang/String;)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->setPriority(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->setTrafficStatsTag(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->setTrafficStatsUid(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->cancel()V,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->flush()V,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->getHttpMethod()Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->getPriority()I,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->getTrafficStatsTag()I,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->getTrafficStatsUid()I,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->hasTrafficStatsTag()Z,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->hasTrafficStatsUid()Z,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->isDelayRequestHeadersUntilFirstFlushEnabled()Z,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->isDone()Z,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->read(Ljava/nio/ByteBuffer;)V,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->start()V,public-api,sdk,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->write(Ljava/nio/ByteBuffer;Z)V,public-api,sdk,system-api,test-api
 Landroid/net/http/CallbackException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V,public-api,sdk,system-api,test-api
 Landroid/net/http/ConnectionMigrationOptions$Builder;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/http/ConnectionMigrationOptions$Builder;->build()Landroid/net/http/ConnectionMigrationOptions;,public-api,sdk,system-api,test-api
@@ -3845,6 +3770,12 @@ Landroid/net/http/ConnectionMigrationOptions;->MIGRATION_OPTION_UNSPECIFIED:I,pu
 Landroid/net/http/ConnectionMigrationOptions;->getAllowNonDefaultNetworkUsage()I,public-api,sdk,system-api,test-api
 Landroid/net/http/ConnectionMigrationOptions;->getDefaultNetworkMigration()I,public-api,sdk,system-api,test-api
 Landroid/net/http/ConnectionMigrationOptions;->getPathDegradationMigration()I,public-api,sdk,system-api,test-api
+Landroid/net/http/CronetEngineWrapper;->bindToNetwork(Landroid/net/Network;)V,public-api,sdk,system-api,test-api
+Landroid/net/http/CronetEngineWrapper;->createUrlStreamHandlerFactory()Ljava/net/URLStreamHandlerFactory;,public-api,sdk,system-api,test-api
+Landroid/net/http/CronetEngineWrapper;->newBidirectionalStreamBuilder(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/http/BidirectionalStream$Callback;)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/CronetEngineWrapper;->newUrlRequestBuilder(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/http/UrlRequest$Callback;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/CronetEngineWrapper;->openConnection(Ljava/net/URL;)Ljava/net/URLConnection;,public-api,sdk,system-api,test-api
+Landroid/net/http/CronetEngineWrapper;->shutdown()V,public-api,sdk,system-api,test-api
 Landroid/net/http/DnsOptions$Builder;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/http/DnsOptions$Builder;->build()Landroid/net/http/DnsOptions;,public-api,sdk,system-api,test-api
 Landroid/net/http/DnsOptions$Builder;->setPersistHostCache(I)Landroid/net/http/DnsOptions$Builder;,public-api,sdk,system-api,test-api
@@ -3872,37 +3803,11 @@ Landroid/net/http/DnsOptions;->getPreestablishConnectionsToStaleDnsResults()I,pu
 Landroid/net/http/DnsOptions;->getStaleDns()I,public-api,sdk,system-api,test-api
 Landroid/net/http/DnsOptions;->getStaleDnsOptions()Landroid/net/http/DnsOptions$StaleDnsOptions;,public-api,sdk,system-api,test-api
 Landroid/net/http/DnsOptions;->getUseHttpStackDnsResolver()I,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalBidirectionalStream$Builder;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalBidirectionalStream$Builder;->build()Landroid/net/http/BidirectionalStream;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalBidirectionalStream$Builder;->setDelayRequestHeadersUntilFirstFlushEnabled(Z)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalBidirectionalStream$Builder;->setHttpMethod(Ljava/lang/String;)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalBidirectionalStream$Builder;->setPriority(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->addPublicKeyPins(Ljava/lang/String;Ljava/util/Set;ZLjava/time/Instant;)Landroid/net/http/HttpEngine$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->addQuicHint(Ljava/lang/String;II)Landroid/net/http/HttpEngine$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->build()Landroid/net/http/HttpEngine;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setConnectionMigrationOptions(Landroid/net/http/ConnectionMigrationOptions;)Landroid/net/http/HttpEngine$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setDnsOptions(Landroid/net/http/DnsOptions;)Landroid/net/http/HttpEngine$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setEnableHttp2(Z)Landroid/net/http/HttpEngine$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setEnableHttpCache(IJ)Landroid/net/http/HttpEngine$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setEnablePublicKeyPinningBypassForLocalTrustAnchors(Z)Landroid/net/http/HttpEngine$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setEnableQuic(Z)Landroid/net/http/HttpEngine$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setQuicOptions(Landroid/net/http/QuicOptions;)Landroid/net/http/HttpEngine$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setStoragePath(Ljava/lang/String;)Landroid/net/http/HttpEngine$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setUserAgent(Ljava/lang/String;)Landroid/net/http/HttpEngine$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine;->newBidirectionalStreamBuilder(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/http/BidirectionalStream$Callback;)Landroid/net/http/BidirectionalStream$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine;->newUrlRequestBuilder(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/http/UrlRequest$Callback;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->build()Landroid/net/http/UrlRequest;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setCacheDisabled(Z)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setDirectExecutorAllowed(Z)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setHttpMethod(Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setPriority(I)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setTrafficStatsTag(I)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setTrafficStatsUid(I)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setUploadDataProvider(Landroid/net/http/UploadDataProvider;Ljava/util/concurrent/Executor;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/http/HeaderBlock;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/http/HeaderBlock;->getAsList()Ljava/util/List;,public-api,sdk,system-api,test-api
 Landroid/net/http/HeaderBlock;->getAsMap()Ljava/util/Map;,public-api,sdk,system-api,test-api
+Landroid/net/http/HeaderBlockWrapper;->getAsList()Ljava/util/List;,public-api,sdk,system-api,test-api
+Landroid/net/http/HeaderBlockWrapper;->getAsMap()Ljava/util/Map;,public-api,sdk,system-api,test-api
 Landroid/net/http/HttpEngine$Builder;-><init>(Landroid/content/Context;)V,public-api,sdk,system-api,test-api
 Landroid/net/http/HttpEngine$Builder;->HTTP_CACHE_DISABLED:I,public-api,sdk,system-api,test-api
 Landroid/net/http/HttpEngine$Builder;->HTTP_CACHE_DISK:I,public-api,sdk,system-api,test-api
@@ -3945,7 +3850,11 @@ Landroid/net/http/NetworkException;->ERROR_QUIC_PROTOCOL_FAILED:I,public-api,sdk
 Landroid/net/http/NetworkException;->ERROR_TIMED_OUT:I,public-api,sdk,system-api,test-api
 Landroid/net/http/NetworkException;->getErrorCode()I,public-api,sdk,system-api,test-api
 Landroid/net/http/NetworkException;->isImmediatelyRetryable()Z,public-api,sdk,system-api,test-api
+Landroid/net/http/NetworkExceptionWrapper;->getErrorCode()I,public-api,sdk,system-api,test-api
+Landroid/net/http/NetworkExceptionWrapper;->isImmediatelyRetryable()Z,public-api,sdk,system-api,test-api
 Landroid/net/http/QuicException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V,public-api,sdk,system-api,test-api
+Landroid/net/http/QuicExceptionWrapper;->getErrorCode()I,public-api,sdk,system-api,test-api
+Landroid/net/http/QuicExceptionWrapper;->isImmediatelyRetryable()Z,public-api,sdk,system-api,test-api
 Landroid/net/http/QuicOptions$Builder;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/http/QuicOptions$Builder;->addAllowedQuicHost(Ljava/lang/String;)Landroid/net/http/QuicOptions$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/http/QuicOptions$Builder;->build()Landroid/net/http/QuicOptions;,public-api,sdk,system-api,test-api
@@ -3967,6 +3876,10 @@ Landroid/net/http/UploadDataSink;->onReadError(Ljava/lang/Exception;)V,public-ap
 Landroid/net/http/UploadDataSink;->onReadSucceeded(Z)V,public-api,sdk,system-api,test-api
 Landroid/net/http/UploadDataSink;->onRewindError(Ljava/lang/Exception;)V,public-api,sdk,system-api,test-api
 Landroid/net/http/UploadDataSink;->onRewindSucceeded()V,public-api,sdk,system-api,test-api
+Landroid/net/http/UploadDataSinkWrapper;->onReadError(Ljava/lang/Exception;)V,public-api,sdk,system-api,test-api
+Landroid/net/http/UploadDataSinkWrapper;->onReadSucceeded(Z)V,public-api,sdk,system-api,test-api
+Landroid/net/http/UploadDataSinkWrapper;->onRewindError(Ljava/lang/Exception;)V,public-api,sdk,system-api,test-api
+Landroid/net/http/UploadDataSinkWrapper;->onRewindSucceeded()V,public-api,sdk,system-api,test-api
 Landroid/net/http/UrlRequest$Builder;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/http/UrlRequest$Builder;->bindToNetwork(Landroid/net/Network;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/http/UrlRequest$Builder;->build()Landroid/net/http/UrlRequest;,public-api,sdk,system-api,test-api
@@ -4020,6 +3933,31 @@ Landroid/net/http/UrlRequest;->isDirectExecutorAllowed()Z,public-api,sdk,system-
 Landroid/net/http/UrlRequest;->isDone()Z,public-api,sdk,system-api,test-api
 Landroid/net/http/UrlRequest;->read(Ljava/nio/ByteBuffer;)V,public-api,sdk,system-api,test-api
 Landroid/net/http/UrlRequest;->start()V,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->bindToNetwork(Landroid/net/Network;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->build()Landroid/net/http/UrlRequest;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setCacheDisabled(Z)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setDirectExecutorAllowed(Z)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setHttpMethod(Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setPriority(I)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setTrafficStatsTag(I)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setTrafficStatsUid(I)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setUploadDataProvider(Landroid/net/http/UploadDataProvider;Ljava/util/concurrent/Executor;)Landroid/net/http/UrlRequest$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->cancel()V,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->followRedirect()V,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->getHttpMethod()Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->getPriority()I,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->getStatus(Landroid/net/http/UrlRequest$StatusListener;)V,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->getTrafficStatsTag()I,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->getTrafficStatsUid()I,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->hasTrafficStatsTag()Z,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->hasTrafficStatsUid()Z,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->isCacheDisabled()Z,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->isDirectExecutorAllowed()Z,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->isDone()Z,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->read(Ljava/nio/ByteBuffer;)V,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->start()V,public-api,sdk,system-api,test-api
 Landroid/net/http/UrlResponseInfo;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/http/UrlResponseInfo;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,sdk,system-api,test-api
 Landroid/net/http/UrlResponseInfo;->getHttpStatusCode()I,public-api,sdk,system-api,test-api
@@ -4029,6 +3967,18 @@ Landroid/net/http/UrlResponseInfo;->getReceivedByteCount()J,public-api,sdk,syste
 Landroid/net/http/UrlResponseInfo;->getUrl()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/http/UrlResponseInfo;->getUrlChain()Ljava/util/List;,public-api,sdk,system-api,test-api
 Landroid/net/http/UrlResponseInfo;->wasCached()Z,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper$HeaderBlockImpl$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper$HeaderBlockImpl$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper$HeaderBlockImpl;->getAsList()Ljava/util/List;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper$HeaderBlockImpl;->getAsMap()Ljava/util/Map;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getHttpStatusCode()I,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getHttpStatusText()Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getNegotiatedProtocol()Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getReceivedByteCount()J,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getUrl()Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getUrlChain()Ljava/util/List;,public-api,sdk,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->wasCached()Z,public-api,sdk,system-api,test-api
 Landroid/net/netstats/provider/INetworkStatsProvider$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/netstats/provider/INetworkStatsProvider$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/netstats/provider/INetworkStatsProvider$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
diff --git a/go/current/hiddenapi/filtered-stub-flags.csv b/go/current/hiddenapi/filtered-stub-flags.csv
index 5915b9f..5106159 100644
--- a/go/current/hiddenapi/filtered-stub-flags.csv
+++ b/go/current/hiddenapi/filtered-stub-flags.csv
@@ -159,7 +159,6 @@ Landroid/nearby/PairStatusMetadata$1;->createFromParcel(Landroid/os/Parcel;)Ljav
 Landroid/nearby/PairStatusMetadata$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/nearby/PairStatusMetadata;->describeContents()I,public-api,system-api,test-api
 Landroid/nearby/PairStatusMetadata;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/nearby/PairStatusMetadata;->getStability()I,system-api,test-api
 Landroid/nearby/PairStatusMetadata;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/nearby/PairStatusMetadata;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/nearby/PairStatusMetadata;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
@@ -1393,9 +1392,14 @@ Landroid/net/NetworkStateSnapshot;->hashCode()I,core-platform-api,public-api,sys
 Landroid/net/NetworkStateSnapshot;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStateSnapshot;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/NetworkStats$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStats$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/NetworkStats$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda4;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda6;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda7;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkStats$$ExternalSyntheticLambda8;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStats$1;->hasNext()Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStats$1;->next()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkStats$2;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -2326,6 +2330,8 @@ Landroid/net/connectivity/org/chromium/net/AndroidNetworkLibrary$SocketFd$Socket
 Landroid/net/connectivity/org/chromium/net/AndroidNetworkLibrary$SocketFd$SocketImplFd;->listen(I)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/AndroidNetworkLibrary$SocketFd$SocketImplFd;->sendUrgentData(I)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/AndroidNetworkLibrary$SocketFd$SocketImplFd;->setOption(ILjava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/CronetEngine$Builder$1;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/CronetProvider;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/HttpNegotiateAuthenticator$GetAccountsCallback;->run(Landroid/accounts/AccountManagerFuture;)V,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/HttpNegotiateAuthenticator$GetTokenCallback$1;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/HttpNegotiateAuthenticator$GetTokenCallback;->run(Landroid/accounts/AccountManagerFuture;)V,public-api,system-api,test-api
@@ -2355,15 +2361,9 @@ Landroid/net/connectivity/org/chromium/net/ProxyChangeListener$$ExternalSyntheti
 Landroid/net/connectivity/org/chromium/net/ProxyChangeListener$ProxyConfig;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/ProxyChangeListener$ProxyReceiver$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/ProxyChangeListener$ProxyReceiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/UploadDataProvider;->close()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/X509Util$TrustStorageListener;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->build()Landroid/net/http/BidirectionalStream;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->setDelayRequestHeadersUntilFirstFlushEnabled(Z)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->setHttpMethod(Ljava/lang/String;)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->setPriority(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->setTrafficStatsTag(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamBuilderImpl;->setTrafficStatsUid(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/BidirectionalStreamNetworkException;->isImmediatelyRetryable()Z,public-api,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/apihelpers/UploadDataProviders$FileUploadProvider;->close()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$3;->run()V,core-platform-api,public-api,system-api,test-api
@@ -2371,30 +2371,12 @@ Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$4;->ru
 Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$5;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$OnReadCompletedRunnable;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream$OnWriteCompletedRunnable;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->cancel()V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->flush()V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->getHttpMethod()Ljava/lang/String;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->getPriority()I,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->getTrafficStatsTag()I,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->getTrafficStatsUid()I,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->hasTrafficStatsTag()Z,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->hasTrafficStatsUid()Z,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->isDelayRequestHeadersUntilFirstFlushEnabled()Z,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->isDone()Z,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->read(Ljava/nio/ByteBuffer;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->start()V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetBidirectionalStream;->write(Ljava/nio/ByteBuffer;Z)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetEngineBase;->newUrlRequestBuilder(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/http/UrlRequest$Callback;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetLibraryLoader$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetLogger$CronetVersion;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/impl/CronetLoggerFactory$SwapLoggerForTesting;->close()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream$1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream$2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream$3;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream;->onReadError(Ljava/lang/Exception;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream;->onReadSucceeded(Z)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream;->onRewindError(Ljava/lang/Exception;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUploadDataStream;->onRewindSucceeded()V,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$3;->run()V,core-platform-api,public-api,system-api,test-api
@@ -2405,104 +2387,27 @@ Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$7;->run()V,core
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$8;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$9;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest$OnReadCompletedRunnable;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->cancel()V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->followRedirect()V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->getHttpMethod()Ljava/lang/String;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->getPriority()I,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->getStatus(Landroid/net/http/UrlRequest$StatusListener;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->getTrafficStatsTag()I,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->getTrafficStatsUid()I,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->hasTrafficStatsTag()Z,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->hasTrafficStatsUid()Z,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->isCacheDisabled()Z,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->isDirectExecutorAllowed()Z,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->isDone()Z,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->read(Ljava/nio/ByteBuffer;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequest;->start()V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext$1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext$2;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext;->bindToNetwork(Landroid/net/Network;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext;->createUrlStreamHandlerFactory()Ljava/net/URLStreamHandlerFactory;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext;->newBidirectionalStreamBuilder(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/http/BidirectionalStream$Callback;)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext;->openConnection(Ljava/net/URL;)Ljava/net/URLConnection;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext;->shutdown()V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/HeaderBlockImpl$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/HeaderBlockImpl$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/HeaderBlockImpl;->getAsList()Ljava/util/List;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/HeaderBlockImpl;->getAsMap()Ljava/util/Map;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/NetworkExceptionImpl;->getErrorCode()I,public-api,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext$3;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/impl/CronetUrlRequestContext$4;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/impl/NativeCronetProvider;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/org/chromium/net/impl/NativeCronetProvider;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/NetworkExceptionImpl;->getMessage()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/NetworkExceptionImpl;->isImmediatelyRetryable()Z,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/QuicExceptionImpl;->getErrorCode()I,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/QuicExceptionImpl;->getMessage()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/QuicExceptionImpl;->isImmediatelyRetryable()Z,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->bindToNetwork(Landroid/net/Network;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->build()Landroid/net/http/UrlRequest;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setCacheDisabled(Z)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setDirectExecutorAllowed(Z)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setHttpMethod(Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setPriority(I)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setTrafficStatsTag(I)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setTrafficStatsUid(I)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlRequestBuilderImpl;->setUploadDataProvider(Landroid/net/http/UploadDataProvider;Ljava/util/concurrent/Executor;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getHttpStatusCode()I,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getHttpStatusText()Ljava/lang/String;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getNegotiatedProtocol()Ljava/lang/String;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getReceivedByteCount()J,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getUrl()Ljava/lang/String;,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->getUrlChain()Ljava/util/List;,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/UrlResponseInfoImpl;->wasCached()Z,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onCanceled(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onFailed(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;Landroid/net/http/HttpException;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onReadCompleted(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;Ljava/nio/ByteBuffer;Z)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onResponseHeadersReceived(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onResponseTrailersReceived(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;Landroid/net/http/HeaderBlock;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onStreamReady(Landroid/net/http/BidirectionalStream;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onSucceeded(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$BidirectionalStreamCallback;->onWriteCompleted(Landroid/net/http/BidirectionalStream;Landroid/net/http/UrlResponseInfo;Ljava/nio/ByteBuffer;Z)V,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$NetworkQualityRttListenerWrapper;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$NetworkQualityRttListenerWrapper;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$NetworkQualityThroughputListenerWrapper;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$NetworkQualityThroughputListenerWrapper;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UploadDataProviderWrapper;->close()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UploadDataProviderWrapper;->getLength()J,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UploadDataProviderWrapper;->read(Landroid/net/http/UploadDataSink;Ljava/nio/ByteBuffer;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UploadDataProviderWrapper;->rewind(Landroid/net/http/UploadDataSink;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestCallback;->onCanceled(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestCallback;->onFailed(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;Landroid/net/http/HttpException;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestCallback;->onReadCompleted(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;Ljava/nio/ByteBuffer;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestCallback;->onRedirectReceived(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;Ljava/lang/String;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestCallback;->onResponseStarted(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestCallback;->onSucceeded(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/impl/VersionSafeCallbacks$UrlRequestStatusListener;->onStatus(I)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetBufferedOutputStream$UploadDataProviderImpl;->getLength()J,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetBufferedOutputStream$UploadDataProviderImpl;->read(Landroid/net/http/UploadDataSink;Ljava/nio/ByteBuffer;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetBufferedOutputStream$UploadDataProviderImpl;->rewind(Landroid/net/http/UploadDataSink;)V,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetBufferedOutputStream;->write(I)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetBufferedOutputStream;->write([BII)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetChunkedOutputStream$UploadDataProviderImpl;->getLength()J,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetChunkedOutputStream$UploadDataProviderImpl;->read(Landroid/net/http/UploadDataSink;Ljava/nio/ByteBuffer;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetChunkedOutputStream$UploadDataProviderImpl;->rewind(Landroid/net/http/UploadDataSink;)V,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetChunkedOutputStream;->close()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetChunkedOutputStream;->write(I)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetChunkedOutputStream;->write([BII)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetFixedModeOutputStream$UploadDataProviderImpl;->getLength()J,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetFixedModeOutputStream$UploadDataProviderImpl;->read(Landroid/net/http/UploadDataSink;Ljava/nio/ByteBuffer;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetFixedModeOutputStream$UploadDataProviderImpl;->rewind(Landroid/net/http/UploadDataSink;)V,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetFixedModeOutputStream;->write(I)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetFixedModeOutputStream;->write([BII)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection$CronetUrlRequestCallback;->onCanceled(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection$CronetUrlRequestCallback;->onFailed(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;Landroid/net/http/HttpException;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection$CronetUrlRequestCallback;->onReadCompleted(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;Ljava/nio/ByteBuffer;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection$CronetUrlRequestCallback;->onRedirectReceived(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;Ljava/lang/String;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection$CronetUrlRequestCallback;->onResponseStarted(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;)V,public-api,system-api,test-api
-Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection$CronetUrlRequestCallback;->onSucceeded(Landroid/net/http/UrlRequest;Landroid/net/http/UrlResponseInfo;)V,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection;->addRequestProperty(Ljava/lang/String;Ljava/lang/String;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection;->connect()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/org/chromium/net/urlconnection/CronetHttpURLConnection;->disconnect()V,core-platform-api,public-api,system-api,test-api
@@ -2564,6 +2469,27 @@ Landroid/net/http/BidirectionalStream;->isDone()Z,public-api,system-api,test-api
 Landroid/net/http/BidirectionalStream;->read(Ljava/nio/ByteBuffer;)V,public-api,system-api,test-api
 Landroid/net/http/BidirectionalStream;->start()V,public-api,system-api,test-api
 Landroid/net/http/BidirectionalStream;->write(Ljava/nio/ByteBuffer;Z)V,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->build()Landroid/net/http/BidirectionalStream;,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->setDelayRequestHeadersUntilFirstFlushEnabled(Z)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->setHttpMethod(Ljava/lang/String;)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->setPriority(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->setTrafficStatsTag(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamBuilderWrapper;->setTrafficStatsUid(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->cancel()V,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->flush()V,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->getHttpMethod()Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->getPriority()I,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->getTrafficStatsTag()I,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->getTrafficStatsUid()I,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->hasTrafficStatsTag()Z,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->hasTrafficStatsUid()Z,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->isDelayRequestHeadersUntilFirstFlushEnabled()Z,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->isDone()Z,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->read(Ljava/nio/ByteBuffer;)V,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->start()V,public-api,system-api,test-api
+Landroid/net/http/BidirectionalStreamWrapper;->write(Ljava/nio/ByteBuffer;Z)V,public-api,system-api,test-api
 Landroid/net/http/CallbackException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V,public-api,system-api,test-api
 Landroid/net/http/ConnectionMigrationOptions$Builder;-><init>()V,public-api,system-api,test-api
 Landroid/net/http/ConnectionMigrationOptions$Builder;->build()Landroid/net/http/ConnectionMigrationOptions;,public-api,system-api,test-api
@@ -2576,6 +2502,12 @@ Landroid/net/http/ConnectionMigrationOptions;->MIGRATION_OPTION_UNSPECIFIED:I,pu
 Landroid/net/http/ConnectionMigrationOptions;->getAllowNonDefaultNetworkUsage()I,public-api,system-api,test-api
 Landroid/net/http/ConnectionMigrationOptions;->getDefaultNetworkMigration()I,public-api,system-api,test-api
 Landroid/net/http/ConnectionMigrationOptions;->getPathDegradationMigration()I,public-api,system-api,test-api
+Landroid/net/http/CronetEngineWrapper;->bindToNetwork(Landroid/net/Network;)V,public-api,system-api,test-api
+Landroid/net/http/CronetEngineWrapper;->createUrlStreamHandlerFactory()Ljava/net/URLStreamHandlerFactory;,public-api,system-api,test-api
+Landroid/net/http/CronetEngineWrapper;->newBidirectionalStreamBuilder(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/http/BidirectionalStream$Callback;)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
+Landroid/net/http/CronetEngineWrapper;->newUrlRequestBuilder(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/http/UrlRequest$Callback;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
+Landroid/net/http/CronetEngineWrapper;->openConnection(Ljava/net/URL;)Ljava/net/URLConnection;,public-api,system-api,test-api
+Landroid/net/http/CronetEngineWrapper;->shutdown()V,public-api,system-api,test-api
 Landroid/net/http/DnsOptions$Builder;-><init>()V,public-api,system-api,test-api
 Landroid/net/http/DnsOptions$Builder;->build()Landroid/net/http/DnsOptions;,public-api,system-api,test-api
 Landroid/net/http/DnsOptions$Builder;->setPersistHostCache(I)Landroid/net/http/DnsOptions$Builder;,public-api,system-api,test-api
@@ -2603,37 +2535,11 @@ Landroid/net/http/DnsOptions;->getPreestablishConnectionsToStaleDnsResults()I,pu
 Landroid/net/http/DnsOptions;->getStaleDns()I,public-api,system-api,test-api
 Landroid/net/http/DnsOptions;->getStaleDnsOptions()Landroid/net/http/DnsOptions$StaleDnsOptions;,public-api,system-api,test-api
 Landroid/net/http/DnsOptions;->getUseHttpStackDnsResolver()I,public-api,system-api,test-api
-Landroid/net/http/ExperimentalBidirectionalStream$Builder;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalBidirectionalStream$Builder;->build()Landroid/net/http/BidirectionalStream;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalBidirectionalStream$Builder;->setDelayRequestHeadersUntilFirstFlushEnabled(Z)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalBidirectionalStream$Builder;->setHttpMethod(Ljava/lang/String;)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalBidirectionalStream$Builder;->setPriority(I)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->addPublicKeyPins(Ljava/lang/String;Ljava/util/Set;ZLjava/time/Instant;)Landroid/net/http/HttpEngine$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->addQuicHint(Ljava/lang/String;II)Landroid/net/http/HttpEngine$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->build()Landroid/net/http/HttpEngine;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setConnectionMigrationOptions(Landroid/net/http/ConnectionMigrationOptions;)Landroid/net/http/HttpEngine$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setDnsOptions(Landroid/net/http/DnsOptions;)Landroid/net/http/HttpEngine$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setEnableHttp2(Z)Landroid/net/http/HttpEngine$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setEnableHttpCache(IJ)Landroid/net/http/HttpEngine$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setEnablePublicKeyPinningBypassForLocalTrustAnchors(Z)Landroid/net/http/HttpEngine$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setEnableQuic(Z)Landroid/net/http/HttpEngine$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setQuicOptions(Landroid/net/http/QuicOptions;)Landroid/net/http/HttpEngine$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setStoragePath(Ljava/lang/String;)Landroid/net/http/HttpEngine$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine$Builder;->setUserAgent(Ljava/lang/String;)Landroid/net/http/HttpEngine$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine;->newBidirectionalStreamBuilder(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/http/BidirectionalStream$Callback;)Landroid/net/http/BidirectionalStream$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalHttpEngine;->newUrlRequestBuilder(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/http/UrlRequest$Callback;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->build()Landroid/net/http/UrlRequest;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setCacheDisabled(Z)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setDirectExecutorAllowed(Z)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setHttpMethod(Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setPriority(I)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setTrafficStatsTag(I)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setTrafficStatsUid(I)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
-Landroid/net/http/ExperimentalUrlRequest$Builder;->setUploadDataProvider(Landroid/net/http/UploadDataProvider;Ljava/util/concurrent/Executor;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
 Landroid/net/http/HeaderBlock;-><init>()V,public-api,system-api,test-api
 Landroid/net/http/HeaderBlock;->getAsList()Ljava/util/List;,public-api,system-api,test-api
 Landroid/net/http/HeaderBlock;->getAsMap()Ljava/util/Map;,public-api,system-api,test-api
+Landroid/net/http/HeaderBlockWrapper;->getAsList()Ljava/util/List;,public-api,system-api,test-api
+Landroid/net/http/HeaderBlockWrapper;->getAsMap()Ljava/util/Map;,public-api,system-api,test-api
 Landroid/net/http/HttpEngine$Builder;-><init>(Landroid/content/Context;)V,public-api,system-api,test-api
 Landroid/net/http/HttpEngine$Builder;->HTTP_CACHE_DISABLED:I,public-api,system-api,test-api
 Landroid/net/http/HttpEngine$Builder;->HTTP_CACHE_DISK:I,public-api,system-api,test-api
@@ -2676,7 +2582,11 @@ Landroid/net/http/NetworkException;->ERROR_QUIC_PROTOCOL_FAILED:I,public-api,sys
 Landroid/net/http/NetworkException;->ERROR_TIMED_OUT:I,public-api,system-api,test-api
 Landroid/net/http/NetworkException;->getErrorCode()I,public-api,system-api,test-api
 Landroid/net/http/NetworkException;->isImmediatelyRetryable()Z,public-api,system-api,test-api
+Landroid/net/http/NetworkExceptionWrapper;->getErrorCode()I,public-api,system-api,test-api
+Landroid/net/http/NetworkExceptionWrapper;->isImmediatelyRetryable()Z,public-api,system-api,test-api
 Landroid/net/http/QuicException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V,public-api,system-api,test-api
+Landroid/net/http/QuicExceptionWrapper;->getErrorCode()I,public-api,system-api,test-api
+Landroid/net/http/QuicExceptionWrapper;->isImmediatelyRetryable()Z,public-api,system-api,test-api
 Landroid/net/http/QuicOptions$Builder;-><init>()V,public-api,system-api,test-api
 Landroid/net/http/QuicOptions$Builder;->addAllowedQuicHost(Ljava/lang/String;)Landroid/net/http/QuicOptions$Builder;,public-api,system-api,test-api
 Landroid/net/http/QuicOptions$Builder;->build()Landroid/net/http/QuicOptions;,public-api,system-api,test-api
@@ -2698,6 +2608,10 @@ Landroid/net/http/UploadDataSink;->onReadError(Ljava/lang/Exception;)V,public-ap
 Landroid/net/http/UploadDataSink;->onReadSucceeded(Z)V,public-api,system-api,test-api
 Landroid/net/http/UploadDataSink;->onRewindError(Ljava/lang/Exception;)V,public-api,system-api,test-api
 Landroid/net/http/UploadDataSink;->onRewindSucceeded()V,public-api,system-api,test-api
+Landroid/net/http/UploadDataSinkWrapper;->onReadError(Ljava/lang/Exception;)V,public-api,system-api,test-api
+Landroid/net/http/UploadDataSinkWrapper;->onReadSucceeded(Z)V,public-api,system-api,test-api
+Landroid/net/http/UploadDataSinkWrapper;->onRewindError(Ljava/lang/Exception;)V,public-api,system-api,test-api
+Landroid/net/http/UploadDataSinkWrapper;->onRewindSucceeded()V,public-api,system-api,test-api
 Landroid/net/http/UrlRequest$Builder;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
 Landroid/net/http/UrlRequest$Builder;->bindToNetwork(Landroid/net/Network;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
 Landroid/net/http/UrlRequest$Builder;->build()Landroid/net/http/UrlRequest;,public-api,system-api,test-api
@@ -2751,6 +2665,31 @@ Landroid/net/http/UrlRequest;->isDirectExecutorAllowed()Z,public-api,system-api,
 Landroid/net/http/UrlRequest;->isDone()Z,public-api,system-api,test-api
 Landroid/net/http/UrlRequest;->read(Ljava/nio/ByteBuffer;)V,public-api,system-api,test-api
 Landroid/net/http/UrlRequest;->start()V,public-api,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->addHeader(Ljava/lang/String;Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->bindToNetwork(Landroid/net/Network;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->build()Landroid/net/http/UrlRequest;,public-api,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setCacheDisabled(Z)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setDirectExecutorAllowed(Z)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setHttpMethod(Ljava/lang/String;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setPriority(I)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setTrafficStatsTag(I)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setTrafficStatsUid(I)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
+Landroid/net/http/UrlRequestBuilderWrapper;->setUploadDataProvider(Landroid/net/http/UploadDataProvider;Ljava/util/concurrent/Executor;)Landroid/net/http/UrlRequest$Builder;,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->cancel()V,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->followRedirect()V,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->getHttpMethod()Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->getPriority()I,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->getStatus(Landroid/net/http/UrlRequest$StatusListener;)V,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->getTrafficStatsTag()I,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->getTrafficStatsUid()I,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->hasTrafficStatsTag()Z,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->hasTrafficStatsUid()Z,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->isCacheDisabled()Z,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->isDirectExecutorAllowed()Z,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->isDone()Z,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->read(Ljava/nio/ByteBuffer;)V,public-api,system-api,test-api
+Landroid/net/http/UrlRequestWrapper;->start()V,public-api,system-api,test-api
 Landroid/net/http/UrlResponseInfo;-><init>()V,public-api,system-api,test-api
 Landroid/net/http/UrlResponseInfo;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,system-api,test-api
 Landroid/net/http/UrlResponseInfo;->getHttpStatusCode()I,public-api,system-api,test-api
@@ -2760,6 +2699,18 @@ Landroid/net/http/UrlResponseInfo;->getReceivedByteCount()J,public-api,system-ap
 Landroid/net/http/UrlResponseInfo;->getUrl()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/http/UrlResponseInfo;->getUrlChain()Ljava/util/List;,public-api,system-api,test-api
 Landroid/net/http/UrlResponseInfo;->wasCached()Z,public-api,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper$HeaderBlockImpl$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper$HeaderBlockImpl$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper$HeaderBlockImpl;->getAsList()Ljava/util/List;,public-api,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper$HeaderBlockImpl;->getAsMap()Ljava/util/Map;,public-api,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getHeaders()Landroid/net/http/HeaderBlock;,public-api,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getHttpStatusCode()I,public-api,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getHttpStatusText()Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getNegotiatedProtocol()Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getReceivedByteCount()J,public-api,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getUrl()Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->getUrlChain()Ljava/util/List;,public-api,system-api,test-api
+Landroid/net/http/UrlResponseInfoWrapper;->wasCached()Z,public-api,system-api,test-api
 Landroid/net/netstats/provider/INetworkStatsProvider$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/netstats/provider/INetworkStatsProvider$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/netstats/provider/INetworkStatsProvider$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
diff --git a/go/current/hiddenapi/index.csv b/go/current/hiddenapi/index.csv
index 88abd7f..1beb6c5 100644
--- a/go/current/hiddenapi/index.csv
+++ b/go/current/hiddenapi/index.csv
@@ -78,10 +78,10 @@ Landroid/net/INetworkStatsSession;->getHistoryForUid(Landroid/net/NetworkTemplat
 Landroid/net/INetworkStatsSession;->close()V,packages/modules/Connectivity/framework-t/src/android/net/INetworkStatsSession.aidl,67,1,67,25,
 Landroid/net/IpConfiguration;->httpProxy:Landroid/net/ProxyInfo;,packages/modules/Connectivity/framework/src/android/net/IpConfiguration.java,84,5,84,25,
 Landroid/net/IpConfiguration;-><init>(Landroid/net/IpConfiguration$IpAssignment;Landroid/net/IpConfiguration$ProxySettings;Landroid/net/StaticIpConfiguration;Landroid/net/ProxyInfo;)V,packages/modules/Connectivity/framework/src/android/net/IpConfiguration.java,106,5,106,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/LinkAddress;->address:Ljava/net/InetAddress;,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,81,5,81,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/LinkAddress;->prefixLength:I,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,87,5,87,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/LinkAddress;->isIPv6()Z,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,172,5,172,63,maxTargetSdk=28
-Landroid/net/LinkAddress;->getNetworkPrefixLength()I,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,412,5,412,25,
+Landroid/net/LinkAddress;->address:Ljava/net/InetAddress;,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,83,5,83,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/LinkAddress;->prefixLength:I,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,89,5,89,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/LinkAddress;->isIPv6()Z,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,170,5,170,63,maxTargetSdk=28
+Landroid/net/LinkAddress;->getNetworkPrefixLength()I,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,410,5,410,25,
 Landroid/net/LinkProperties;->mIfaceName:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,61,5,61,88,maxTargetSdk=28&trackingBug=115609023L
 Landroid/net/LinkProperties;->compareProvisioning(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Landroid/net/LinkProperties$ProvisioningChange;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,121,5,121,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/LinkProperties;->getAllAddresses()Ljava/util/List;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,270,5,270,25,
@@ -105,9 +105,9 @@ Landroid/net/Network;->netId:I,packages/modules/Connectivity/framework/src/andro
 Landroid/net/Network;-><init>(I)V,packages/modules/Connectivity/framework/src/android/net/Network.java,115,5,115,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkAgent;->sendNetworkInfo(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkAgent.java,1078,5,1078,88,maxTargetSdk=28&trackingBug=115609023L
 Landroid/net/NetworkCapabilities;->mNetworkCapabilities:J,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,385,5,385,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1743,5,1743,63,maxTargetSdk=28
-Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1769,5,1769,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2494,5,2494,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1736,5,1736,63,maxTargetSdk=28
+Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1762,5,1762,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2487,5,2487,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkInfo;-><init>(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,182,5,182,25,
 Landroid/net/NetworkInfo;->setSubtype(ILjava/lang/String;)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,253,5,253,25,
 Landroid/net/NetworkInfo;->setIsAvailable(Z)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,390,5,390,25,
@@ -119,38 +119,38 @@ Landroid/net/NetworkRequest;->legacyType:I,packages/modules/Connectivity/framewo
 Landroid/net/NetworkState;->network:Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/NetworkState.java,41,5,41,88,maxTargetSdk=28&trackingBug=115609023L
 Landroid/net/NetworkState;-><init>(Landroid/os/Parcel;)V,packages/modules/Connectivity/framework/src/android/net/NetworkState.java,92,5,92,25,
 Landroid/net/NetworkState;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework/src/android/net/NetworkState.java,117,5,117,25,
-Landroid/net/NetworkStats$Entry;->iface:Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,254,9,254,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats$Entry;->uid:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,257,9,257,29,
-Landroid/net/NetworkStats$Entry;->set:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,260,9,260,29,
-Landroid/net/NetworkStats$Entry;->tag:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,263,9,263,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats$Entry;->rxBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,287,9,287,29,
-Landroid/net/NetworkStats$Entry;->rxPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,290,9,290,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats$Entry;->txBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,293,9,293,29,
-Landroid/net/NetworkStats$Entry;->txPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,296,9,296,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats$Entry;->operations:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,299,9,299,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats$Entry;-><init>()V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,303,9,303,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats;->size:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,215,5,215,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats;->capacity:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,217,5,217,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats;->iface:[Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,219,5,219,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats;->uid:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,221,5,221,25,
-Landroid/net/NetworkStats;->set:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,223,5,223,25,
-Landroid/net/NetworkStats;->tag:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,225,5,225,25,
-Landroid/net/NetworkStats;->metered:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,227,5,227,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats;->roaming:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,229,5,229,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats;->defaultNetwork:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,231,5,231,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats;->rxBytes:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,233,5,233,25,
-Landroid/net/NetworkStats;->rxPackets:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,235,5,235,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats;->txBytes:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,237,5,237,25,
-Landroid/net/NetworkStats;->txPackets:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,239,5,239,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats;->operations:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,241,5,241,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats;-><init>(Landroid/os/Parcel;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,521,5,521,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats;->getValues(ILandroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,698,5,698,25,
-Landroid/net/NetworkStats;->size()I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,756,5,756,25,
-Landroid/net/NetworkStats;->getUniqueUids()[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,927,5,927,25,
-Landroid/net/NetworkStats;->getTotalBytes()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,947,5,947,25,
-Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,957,5,957,25,
-Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;I)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,967,5,967,25,
-Landroid/net/NetworkStats;->getTotalIncludingTags(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,982,5,982,25,
+Landroid/net/NetworkStats$Entry;->iface:Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,255,9,255,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;->uid:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,258,9,258,29,
+Landroid/net/NetworkStats$Entry;->set:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,261,9,261,29,
+Landroid/net/NetworkStats$Entry;->tag:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,264,9,264,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;->rxBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,288,9,288,29,
+Landroid/net/NetworkStats$Entry;->rxPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,291,9,291,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;->txBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,294,9,294,29,
+Landroid/net/NetworkStats$Entry;->txPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,297,9,297,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;->operations:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,300,9,300,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;-><init>()V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,304,9,304,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->size:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,216,5,216,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->capacity:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,218,5,218,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->iface:[Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,220,5,220,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->uid:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,222,5,222,25,
+Landroid/net/NetworkStats;->set:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,224,5,224,25,
+Landroid/net/NetworkStats;->tag:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,226,5,226,25,
+Landroid/net/NetworkStats;->metered:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,228,5,228,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->roaming:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,230,5,230,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->defaultNetwork:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,232,5,232,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->rxBytes:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,234,5,234,25,
+Landroid/net/NetworkStats;->rxPackets:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,236,5,236,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->txBytes:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,238,5,238,25,
+Landroid/net/NetworkStats;->txPackets:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,240,5,240,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->operations:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,242,5,242,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;-><init>(Landroid/os/Parcel;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,557,5,557,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->getValues(ILandroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,734,5,734,25,
+Landroid/net/NetworkStats;->size()I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,792,5,792,25,
+Landroid/net/NetworkStats;->getUniqueUids()[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,963,5,963,25,
+Landroid/net/NetworkStats;->getTotalBytes()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,983,5,983,25,
+Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,993,5,993,25,
+Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;I)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,1003,5,1003,25,
+Landroid/net/NetworkStats;->getTotalIncludingTags(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,1018,5,1018,25,
 Landroid/net/NetworkStatsHistory$Entry;->bucketDuration:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,134,9,134,92,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkStatsHistory$Entry;->bucketStart:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,137,9,137,92,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkStatsHistory$Entry;->rxBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,142,9,142,29,
diff --git a/go/current/hiddenapi/signature-patterns.csv b/go/current/hiddenapi/signature-patterns.csv
index 457b96b..c094010 100644
--- a/go/current/hiddenapi/signature-patterns.csv
+++ b/go/current/hiddenapi/signature-patterns.csv
@@ -133,30 +133,40 @@ android/net/UnderlyingNetworkInfo
 android/net/VpnTransportInfo
 android/net/apf/**
 android/net/connectivity/**
-android/net/http/ApiVersion
 android/net/http/BidirectionalStream
+android/net/http/BidirectionalStreamBuilderWrapper
+android/net/http/BidirectionalStreamCallbackWrapper
+android/net/http/BidirectionalStreamWrapper
 android/net/http/CallbackException
+android/net/http/CallbackExceptionWrapper
 android/net/http/ConnectionMigrationOptions
+android/net/http/CronetEngineBuilderWrapper
+android/net/http/CronetEngineWrapper
+android/net/http/CronetExceptionTranslationUtils
+android/net/http/CronetExceptionWrapper
 android/net/http/DnsOptions
-android/net/http/ExperimentalBidirectionalStream
-android/net/http/ExperimentalHttpEngine
-android/net/http/ExperimentalOptionsTranslatingHttpEngineBuilder
-android/net/http/ExperimentalUrlRequest
 android/net/http/HeaderBlock
+android/net/http/HeaderBlockWrapper
 android/net/http/HttpEngine
 android/net/http/HttpException
 android/net/http/IHttpEngineBuilder
 android/net/http/InlineExecutionProhibitedException
 android/net/http/NetworkException
-android/net/http/NetworkQualityRttListener
-android/net/http/NetworkQualityThroughputListener
+android/net/http/NetworkExceptionWrapper
 android/net/http/QuicException
+android/net/http/QuicExceptionWrapper
 android/net/http/QuicOptions
-android/net/http/RequestFinishedInfo
 android/net/http/UploadDataProvider
+android/net/http/UploadDataProviderWrapper
 android/net/http/UploadDataSink
+android/net/http/UploadDataSinkWrapper
 android/net/http/UrlRequest
+android/net/http/UrlRequestBuilderWrapper
+android/net/http/UrlRequestCallbackWrapper
+android/net/http/UrlRequestStatusListenerWrapper
+android/net/http/UrlRequestWrapper
 android/net/http/UrlResponseInfo
+android/net/http/UrlResponseInfoWrapper
 android/net/http/apihelpers/**
 android/net/netstats/provider/**
 android/net/nsd/**
diff --git a/go/current/sdk_library/public/framework-connectivity.srcjar b/go/current/sdk_library/public/framework-connectivity.srcjar
index d01d2e4..f709edf 100644
--- a/go/current/sdk_library/public/framework-connectivity.srcjar
+++ b/go/current/sdk_library/public/framework-connectivity.srcjar
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index f9eedbc..4dfe769 100644
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10414058
\ No newline at end of file
+10764680
\ No newline at end of file