From f14738e605524e48ec39b9897029b64e865fa4ea Mon Sep 17 00:00:00 2001
From: Alyssa Ketpreechasawat <kalyssa@google.com>
Date: Sun, 8 Oct 2023 14:58:30 +0000
Subject: Drop prebuilt files to android source tree.

The following files have been updated as part of this change:

current/Android.bp
current/snapshot-creation-build-number.txt
current/x86_64/lib/libnetd_updatable.so
current/arm/lib/libnetd_updatable.so
current/java_systemserver_libs/snapshot/jars/are/invalid/service-connectivity.jar
current/licenses/build/soong/licenses/LICENSE
current/x86/lib/libnetd_updatable.so
current/hiddenapi/annotation-flags.csv
current/hiddenapi/filtered-flags.csv
current/hiddenapi/filtered-stub-flags.csv
current/hiddenapi/hiddenapi-max-target-o-low-priority-tiramisu.txt
current/hiddenapi/hiddenapi-max-target-o-low-priority.txt
current/hiddenapi/hiddenapi-max-target-r-loprio.txt
current/hiddenapi/hiddenapi-unsupported-tiramisu.txt
current/hiddenapi/hiddenapi-unsupported.txt
current/hiddenapi/index.csv
current/hiddenapi/metadata.csv
current/hiddenapi/signature-patterns.csv
current/sdk_library/system/framework-connectivity-removed.txt
current/sdk_library/system/framework-connectivity-stubs.jar
current/sdk_library/system/framework-connectivity-t-removed.txt
current/sdk_library/system/framework-connectivity-t-stubs.jar
current/sdk_library/system/framework-connectivity-t.srcjar
current/sdk_library/system/framework-connectivity-t.txt
current/sdk_library/system/framework-connectivity-t_annotations.zip
current/sdk_library/system/framework-connectivity.srcjar
current/sdk_library/system/framework-connectivity.txt
current/sdk_library/system/framework-connectivity_annotations.zip
current/sdk_library/system/framework-tethering-removed.txt
current/sdk_library/system/framework-tethering-stubs.jar
current/sdk_library/system/framework-tethering.srcjar
current/sdk_library/system/framework-tethering.txt
current/sdk_library/system/framework-tethering_annotations.zip
current/sdk_library/module-lib/framework-connectivity-removed.txt
current/sdk_library/module-lib/framework-connectivity-stubs.jar
current/sdk_library/module-lib/framework-connectivity-t-removed.txt
current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
current/sdk_library/module-lib/framework-connectivity-t.srcjar
current/sdk_library/module-lib/framework-connectivity-t.txt
current/sdk_library/module-lib/framework-connectivity-t_annotations.zip
current/sdk_library/module-lib/framework-connectivity.srcjar
current/sdk_library/module-lib/framework-connectivity.txt
current/sdk_library/module-lib/framework-connectivity_annotations.zip
current/sdk_library/module-lib/framework-tethering-removed.txt
current/sdk_library/module-lib/framework-tethering-stubs.jar
current/sdk_library/module-lib/framework-tethering.srcjar
current/sdk_library/module-lib/framework-tethering.txt
current/sdk_library/module-lib/framework-tethering_annotations.zip
current/sdk_library/public/framework-connectivity-removed.txt
current/sdk_library/public/framework-connectivity-stubs.jar
current/sdk_library/public/framework-connectivity-t-removed.txt
current/sdk_library/public/framework-connectivity-t-stubs.jar
current/sdk_library/public/framework-connectivity-t.srcjar
current/sdk_library/public/framework-connectivity-t.txt
current/sdk_library/public/framework-connectivity-t_annotations.zip
current/sdk_library/public/framework-connectivity.srcjar
current/sdk_library/public/framework-connectivity.txt
current/sdk_library/public/framework-connectivity_annotations.zip
current/sdk_library/public/framework-tethering-removed.txt
current/sdk_library/public/framework-tethering-stubs.jar
current/sdk_library/public/framework-tethering.srcjar
current/sdk_library/public/framework-tethering.txt
current/sdk_library/public/framework-tethering_annotations.zip
current/arm64/lib/libnetd_updatable.so
current/compat_configs/connectivity-platform-compat-config/connectivity-platform-compat-config_meta.xml
current/include/packages/modules/Connectivity/netd/include/NetdUpdatablePublic.h

Built here: ab/10917791

This build IS suitable for public release.

The change is generated with prebuilt drop tool.

Test: presubmit
Change-Id: Ia55b9efa8ab9b6569dc1ef52654fc8be6c050aed
---
 .../prebuilt_info_current_current_zip.asciipb      |   8 +-
 current/arm/lib/libnetd_updatable.so               | Bin 3456 -> 3456 bytes
 current/arm64/lib/libnetd_updatable.so             | Bin 134696 -> 11816 bytes
 current/hiddenapi/filtered-flags.csv               | 393 ++++++++-------------
 current/hiddenapi/filtered-stub-flags.csv          | 390 ++++++++------------
 current/hiddenapi/index.csv                        |  84 ++---
 current/hiddenapi/signature-patterns.csv           |  43 ++-
 .../module-lib/framework-connectivity-t-stubs.jar  | Bin 58940 -> 62896 bytes
 .../module-lib/framework-connectivity-t.srcjar     | Bin 39023 -> 42518 bytes
 .../framework-connectivity-t_annotations.zip       | Bin 4585 -> 5246 bytes
 .../public/framework-connectivity-stubs.jar        | Bin 53850 -> 53850 bytes
 .../public/framework-connectivity-t.srcjar         | Bin 28392 -> 28391 bytes
 .../public/framework-connectivity.srcjar           | Bin 94541 -> 94505 bytes
 .../system/framework-connectivity-t-stubs.jar      | Bin 45606 -> 49562 bytes
 .../system/framework-connectivity-t.srcjar         | Bin 30729 -> 34224 bytes
 .../system/framework-connectivity-t.txt            |  53 +++
 .../framework-connectivity-t_annotations.zip       | Bin 3836 -> 4497 bytes
 current/snapshot-creation-build-number.txt         |   2 +-
 current/x86/lib/libnetd_updatable.so               | Bin 3376 -> 3376 bytes
 current/x86_64/lib/libnetd_updatable.so            | Bin 4320 -> 4320 bytes
 20 files changed, 438 insertions(+), 535 deletions(-)

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 5da87a4..fc6d383 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,14 +1,14 @@
 drops {
   android_build_drop {
-    build_id: "T1007601"
-    target: "train_build"
-    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.tethering/sdk/tethering-module-sdk-current.zip"
+    build_id: "10917791"
+    target: "mainline_modules_sdks-trunk-userdebug"
+    source_file: "mainline-sdks/for-latest-build/current/com.google.android.tethering/sdk/tethering-module-sdk-current.zip"
   }
   dest_file: "current/current.zip"
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/Connectivity"
-  git_branch: "udc-d1-dev"
+  git_branch: "main"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/current/arm/lib/libnetd_updatable.so b/current/arm/lib/libnetd_updatable.so
index 1109346..7e1645a 100755
Binary files a/current/arm/lib/libnetd_updatable.so and b/current/arm/lib/libnetd_updatable.so differ
diff --git a/current/arm64/lib/libnetd_updatable.so b/current/arm64/lib/libnetd_updatable.so
index 38181e1..c33f694 100755
Binary files a/current/arm64/lib/libnetd_updatable.so and b/current/arm64/lib/libnetd_updatable.so differ
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index d9cca04..53a4e7a 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -155,7 +155,6 @@ Landroid/nearby/DataElement;->getKey()I,sdk,system-api,test-api
 Landroid/nearby/DataElement;->getValue()[B,sdk,system-api,test-api
 Landroid/nearby/DataElement;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/nearby/DataElement;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/FastPairDataProviderService;->onBind(Landroid/content/Intent;)Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/FastPairDevice$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/nearby/FastPairDevice$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/nearby/FastPairDevice;->describeContents()I,public-api,sdk,system-api,test-api
@@ -167,10 +166,6 @@ Landroid/nearby/IBroadcastListener$Default;->asBinder()Landroid/os/IBinder;,publ
 Landroid/nearby/IBroadcastListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/IBroadcastListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/IBroadcastListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/nearby/INearbyManager$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/INearbyManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/INearbyManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
@@ -221,13 +216,6 @@ Landroid/nearby/OffloadCapability;->isFastPairSupported()Z,sdk,system-api,test-a
 Landroid/nearby/OffloadCapability;->isNearbyShareSupported()Z,sdk,system-api,test-api
 Landroid/nearby/OffloadCapability;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/nearby/OffloadCapability;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/PairStatusMetadata$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-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;->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
 Landroid/nearby/PresenceBroadcastRequest$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/nearby/PresenceBroadcastRequest$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/nearby/PresenceBroadcastRequest$Builder;-><init>(Ljava/util/List;[BLandroid/nearby/PrivateCredential;)V,sdk,system-api,test-api
@@ -361,82 +349,6 @@ Landroid/nearby/ScanRequest;->isValidScanType(I)Z,sdk,system-api,test-api
 Landroid/nearby/ScanRequest;->scanModeToString(I)Ljava/lang/String;,sdk,system-api,test-api
 Landroid/nearby/ScanRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/nearby/ScanRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/nearby/aidl/IOffloadCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/aidl/IOffloadCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/aidl/IOffloadCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
@@ -552,6 +464,7 @@ Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda1;
 Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda2;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
 Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda3;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
 Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda4;->createService(Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
+Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda5;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
 Landroid/net/ConnectivityManager$2;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/ConnectivityManager$3;->onTetheringFailed(I)V,sdk,system-api,test-api
 Landroid/net/ConnectivityManager$3;->onTetheringStarted()V,sdk,system-api,test-api
@@ -892,16 +805,16 @@ Landroid/net/DhcpOption$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Obje
 Landroid/net/DhcpOption$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/DhcpOption;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/DhcpOption;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onCancel()V,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->onCancel()V,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->onCancel()V,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda7;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->onCancel()V,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onAnswer(Ljava/lang/Object;I)V,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onError(Landroid/net/DnsResolver$DnsException;)V,public-api,sdk,system-api,test-api
@@ -1895,7 +1808,7 @@ Landroid/net/Network;->openConnection(Ljava/net/URL;)Ljava/net/URLConnection;,pu
 Landroid/net/Network;->openConnection(Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;,public-api,sdk,system-api,test-api
 Landroid/net/Network;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/Network;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/NetworkAgent$$ExternalSyntheticLambda16;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkAgent$$ExternalSyntheticLambda15;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkAgent$NetworkAgentHandler;->handleMessage(Landroid/os/Message;)V,public-api,sdk,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;ILandroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,sdk,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;Landroid/net/NetworkScore;Landroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,sdk,system-api,test-api
@@ -2029,7 +1942,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
@@ -2354,10 +2266,13 @@ Landroid/net/NetworkStateSnapshot;->equals(Ljava/lang/Object;)Z,core-platform-ap
 Landroid/net/NetworkStateSnapshot;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 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$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,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$$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$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;,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$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
@@ -2901,7 +2816,7 @@ Landroid/net/TetheringInterface;->getType()I,sdk,system-api,test-api
 Landroid/net/TetheringInterface;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringInterface;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringInterface;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/TetheringManager$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/TetheringManager$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$3;->onReceiveResult(ILandroid/os/Bundle;)V,public-api,sdk,system-api,test-api
@@ -3012,8 +2927,6 @@ Landroid/net/TrafficStats;->TAG_SYSTEM_RESTORE:I,lo-prio,max-target-o
 Landroid/net/TrafficStats;->TB_IN_BYTES:J,lo-prio,max-target-o
 Landroid/net/TrafficStats;->TYPE_RX_BYTES:I,lo-prio,max-target-o
 Landroid/net/TrafficStats;->TYPE_RX_PACKETS:I,lo-prio,max-target-o
-Landroid/net/TrafficStats;->TYPE_TCP_RX_PACKETS:I,lo-prio,max-target-o
-Landroid/net/TrafficStats;->TYPE_TCP_TX_PACKETS:I,lo-prio,max-target-o
 Landroid/net/TrafficStats;->TYPE_TX_BYTES:I,lo-prio,max-target-o
 Landroid/net/TrafficStats;->TYPE_TX_PACKETS:I,lo-prio,max-target-o
 Landroid/net/TrafficStats;->UID_REMOVED:I,lo-prio,max-target-o
@@ -3222,11 +3135,25 @@ Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Default;->asBinde
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub$Proxy$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/net/util/DnsUtils$Rfc6724Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->println()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(I)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(Ljava/lang/String;II)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write([CII)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/internal/util/FileRotator$$ExternalSyntheticLambda0;->applyAsLong(Ljava/lang/Object;)J,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/modules/utils/HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->getZone()Ljava/time/ZoneId;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->instant()Ljava/time/Instant;,core-platform-api,public-api,sdk,system-api,test-api
@@ -3253,6 +3180,9 @@ Landroid/net/connectivity/com/android/net/module/util/IpRange;->equals(Ljava/lan
 Landroid/net/connectivity/com/android/net/module/util/IpRange;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/Struct;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/Struct;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/Struct;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/google/protobuf/AbstractMessageLite$Builder$LimitedInputStream;->available()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/google/protobuf/AbstractMessageLite$Builder$LimitedInputStream;->read()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/google/protobuf/AbstractMessageLite$Builder$LimitedInputStream;->read([BII)I,core-platform-api,public-api,sdk,system-api,test-api
@@ -3594,6 +3524,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
@@ -3623,15 +3555,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
@@ -3639,30 +3565,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
@@ -3673,104 +3581,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
@@ -3832,6 +3663,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
@@ -3844,6 +3696,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
@@ -3871,37 +3729,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
@@ -3944,7 +3776,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
@@ -3966,6 +3802,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
@@ -4019,6 +3859,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
@@ -4028,6 +3893,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
@@ -4057,12 +3934,16 @@ Landroid/net/nsd/INsdManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sd
 Landroid/net/nsd/INsdManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/nsd/INsdManager;,lo-prio,max-target-r
 Landroid/net/nsd/INsdManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStarted(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStopped(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onServiceFound(Landroid/net/nsd/NsdServiceInfo;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onServiceLost(Landroid/net/nsd/NsdServiceInfo;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onStartDiscoveryFailed(Ljava/lang/String;I)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onStopDiscoveryFailed(Ljava/lang/String;I)V,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$OffloadEngineProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$OffloadEngineProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$PerNetworkDiscoveryTracker$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$PerNetworkDiscoveryTracker$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$PerNetworkDiscoveryTracker$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -4161,6 +4042,7 @@ Landroid/net/nsd/NsdManager;->mMapLock:Ljava/lang/Object;,lo-prio,max-target-o
 Landroid/net/nsd/NsdManager;->mServiceMap:Landroid/util/SparseArray;,lo-prio,max-target-o
 Landroid/net/nsd/NsdManager;->nameOf(I)Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/nsd/NsdManager;->nextListenerKey()I,lo-prio,max-target-o
+Landroid/net/nsd/NsdManager;->registerOffloadEngine(Ljava/lang/String;JJLjava/util/concurrent/Executor;Landroid/net/nsd/OffloadEngine;)V,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->registerService(Landroid/net/nsd/NsdServiceInfo;ILandroid/net/nsd/NsdManager$RegistrationListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->registerService(Landroid/net/nsd/NsdServiceInfo;ILjava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$RegistrationListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->registerServiceInfoCallback(Landroid/net/nsd/NsdServiceInfo;Ljava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$ServiceInfoCallback;)V,public-api,sdk,system-api,test-api
@@ -4169,6 +4051,7 @@ Landroid/net/nsd/NsdManager;->resolveService(Landroid/net/nsd/NsdServiceInfo;Lan
 Landroid/net/nsd/NsdManager;->resolveService(Landroid/net/nsd/NsdServiceInfo;Ljava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$ResolveListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->stopServiceDiscovery(Landroid/net/nsd/NsdManager$DiscoveryListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->stopServiceResolution(Landroid/net/nsd/NsdManager$ResolveListener;)V,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager;->unregisterOffloadEngine(Landroid/net/nsd/OffloadEngine;)V,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->unregisterService(Landroid/net/nsd/NsdManager$RegistrationListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->unregisterServiceInfoCallback(Landroid/net/nsd/NsdManager$ServiceInfoCallback;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -4202,6 +4085,42 @@ Landroid/net/nsd/NsdServiceInfo;->setServiceName(Ljava/lang/String;)V,public-api
 Landroid/net/nsd/NsdServiceInfo;->setServiceType(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_CAPABILITY_BYPASS_MULTICAST_LOCK:I,sdk,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_TYPE_FILTER_QUERIES:I,sdk,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_TYPE_FILTER_REPLIES:I,sdk,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_TYPE_REPLY:I,sdk,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->onOffloadServiceRemoved(Landroid/net/nsd/OffloadServiceInfo;)V,sdk,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->onOffloadServiceUpdated(Landroid/net/nsd/OffloadServiceInfo;)V,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;-><init>(Ljava/lang/String;Ljava/lang/String;)V,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->getServiceName()Ljava/lang/String;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->getServiceType()Ljava/lang/String;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;-><init>(Landroid/net/nsd/OffloadServiceInfo$Key;Ljava/util/List;Ljava/lang/String;[BIJ)V,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getHostname()Ljava/lang/String;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getKey()Landroid/net/nsd/OffloadServiceInfo$Key;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getOffloadPayload()[B,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getOffloadType()J,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getPriority()I,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getSubtypes()Ljava/util/List;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/thread/ThreadNetworkController;->THREAD_VERSION_1_3:I,sdk,system-api,test-api
+Landroid/net/thread/ThreadNetworkController;->getThreadVersion()I,sdk,system-api,test-api
+Landroid/net/thread/ThreadNetworkManager$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/thread/ThreadNetworkManager;->getAllThreadNetworkControllers()Ljava/util/List;,sdk,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 27c7af3..ea3683c 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -89,7 +89,6 @@ Landroid/nearby/DataElement;->getKey()I,system-api,test-api
 Landroid/nearby/DataElement;->getValue()[B,system-api,test-api
 Landroid/nearby/DataElement;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/nearby/DataElement;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/FastPairDataProviderService;->onBind(Landroid/content/Intent;)Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/FastPairDevice$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/nearby/FastPairDevice$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/nearby/FastPairDevice;->describeContents()I,public-api,system-api,test-api
@@ -101,10 +100,6 @@ Landroid/nearby/IBroadcastListener$Default;->asBinder()Landroid/os/IBinder;,publ
 Landroid/nearby/IBroadcastListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/IBroadcastListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/IBroadcastListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/nearby/INearbyManager$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/INearbyManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/INearbyManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
@@ -155,13 +150,6 @@ Landroid/nearby/OffloadCapability;->isFastPairSupported()Z,system-api,test-api
 Landroid/nearby/OffloadCapability;->isNearbyShareSupported()Z,system-api,test-api
 Landroid/nearby/OffloadCapability;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/nearby/OffloadCapability;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/PairStatusMetadata$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-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;->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
 Landroid/nearby/PresenceBroadcastRequest$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/nearby/PresenceBroadcastRequest$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/nearby/PresenceBroadcastRequest$Builder;-><init>(Ljava/util/List;[BLandroid/nearby/PrivateCredential;)V,system-api,test-api
@@ -295,82 +283,6 @@ Landroid/nearby/ScanRequest;->isValidScanType(I)Z,system-api,test-api
 Landroid/nearby/ScanRequest;->scanModeToString(I)Ljava/lang/String;,system-api,test-api
 Landroid/nearby/ScanRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/nearby/ScanRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/nearby/aidl/IOffloadCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/aidl/IOffloadCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/aidl/IOffloadCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
@@ -484,6 +396,7 @@ Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda1;
 Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda2;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
 Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda3;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
 Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda4;->createService(Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
+Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda5;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
 Landroid/net/ConnectivityManager$2;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/ConnectivityManager$3;->onTetheringFailed(I)V,system-api,test-api
 Landroid/net/ConnectivityManager$3;->onTetheringStarted()V,system-api,test-api
@@ -648,16 +561,16 @@ Landroid/net/DhcpOption$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Obje
 Landroid/net/DhcpOption$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/DhcpOption;->describeContents()I,public-api,system-api,test-api
 Landroid/net/DhcpOption;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onCancel()V,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->onCancel()V,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->onCancel()V,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda7;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->onCancel()V,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onAnswer(Ljava/lang/Object;I)V,public-api,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onError(Landroid/net/DnsResolver$DnsException;)V,public-api,system-api,test-api
@@ -1098,7 +1011,7 @@ Landroid/net/Network;->openConnection(Ljava/net/URL;)Ljava/net/URLConnection;,pu
 Landroid/net/Network;->openConnection(Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;,public-api,system-api,test-api
 Landroid/net/Network;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/Network;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/NetworkAgent$$ExternalSyntheticLambda16;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkAgent$$ExternalSyntheticLambda15;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkAgent$NetworkAgentHandler;->handleMessage(Landroid/os/Message;)V,public-api,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;ILandroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;Landroid/net/NetworkScore;Landroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,system-api,test-api
@@ -1391,10 +1304,13 @@ Landroid/net/NetworkStateSnapshot;->equals(Ljava/lang/Object;)Z,core-platform-ap
 Landroid/net/NetworkStateSnapshot;->hashCode()I,core-platform-api,public-api,system-api,test-api
 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$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,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$$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$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;,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$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
@@ -1688,7 +1604,7 @@ Landroid/net/TetheringInterface;->getType()I,system-api,test-api
 Landroid/net/TetheringInterface;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringInterface;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringInterface;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/TetheringManager$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/TetheringManager$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$3;->onReceiveResult(ILandroid/os/Bundle;)V,public-api,system-api,test-api
@@ -1968,11 +1884,25 @@ Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Default;->asBinde
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub$Proxy$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/net/connectivity/android/net/util/DnsUtils$Rfc6724Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->println()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(I)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(Ljava/lang/String;II)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write([CII)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/internal/util/FileRotator$$ExternalSyntheticLambda0;->applyAsLong(Ljava/lang/Object;)J,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/modules/utils/HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->getZone()Ljava/time/ZoneId;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->instant()Ljava/time/Instant;,core-platform-api,public-api,system-api,test-api
@@ -1999,6 +1929,9 @@ Landroid/net/connectivity/com/android/net/module/util/IpRange;->equals(Ljava/lan
 Landroid/net/connectivity/com/android/net/module/util/IpRange;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/Struct;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/Struct;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/Struct;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/google/protobuf/AbstractMessageLite$Builder$LimitedInputStream;->available()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/google/protobuf/AbstractMessageLite$Builder$LimitedInputStream;->read()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/google/protobuf/AbstractMessageLite$Builder$LimitedInputStream;->read([BII)I,core-platform-api,public-api,system-api,test-api
@@ -2325,6 +2258,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
@@ -2354,15 +2289,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
@@ -2370,30 +2299,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
@@ -2404,104 +2315,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
@@ -2563,6 +2397,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
@@ -2575,6 +2430,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
@@ -2602,37 +2463,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
@@ -2675,7 +2510,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
@@ -2697,6 +2536,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
@@ -2750,6 +2593,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
@@ -2759,6 +2627,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
@@ -2782,12 +2662,16 @@ Landroid/net/nsd/INsdManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-
 Landroid/net/nsd/INsdManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/nsd/INsdManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStarted(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStopped(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onServiceFound(Landroid/net/nsd/NsdServiceInfo;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onServiceLost(Landroid/net/nsd/NsdServiceInfo;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onStartDiscoveryFailed(Ljava/lang/String;I)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onStopDiscoveryFailed(Ljava/lang/String;I)V,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$OffloadEngineProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$OffloadEngineProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$PerNetworkDiscoveryTracker$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$PerNetworkDiscoveryTracker$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$PerNetworkDiscoveryTracker$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
@@ -2851,6 +2735,7 @@ Landroid/net/nsd/NsdManager;->PROTOCOL_DNS_SD:I,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->discoverServices(Ljava/lang/String;ILandroid/net/Network;Ljava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$DiscoveryListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->discoverServices(Ljava/lang/String;ILandroid/net/NetworkRequest;Ljava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$DiscoveryListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->discoverServices(Ljava/lang/String;ILandroid/net/nsd/NsdManager$DiscoveryListener;)V,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager;->registerOffloadEngine(Ljava/lang/String;JJLjava/util/concurrent/Executor;Landroid/net/nsd/OffloadEngine;)V,system-api,test-api
 Landroid/net/nsd/NsdManager;->registerService(Landroid/net/nsd/NsdServiceInfo;ILandroid/net/nsd/NsdManager$RegistrationListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->registerService(Landroid/net/nsd/NsdServiceInfo;ILjava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$RegistrationListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->registerServiceInfoCallback(Landroid/net/nsd/NsdServiceInfo;Ljava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$ServiceInfoCallback;)V,public-api,system-api,test-api
@@ -2858,6 +2743,7 @@ Landroid/net/nsd/NsdManager;->resolveService(Landroid/net/nsd/NsdServiceInfo;Lan
 Landroid/net/nsd/NsdManager;->resolveService(Landroid/net/nsd/NsdServiceInfo;Ljava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$ResolveListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->stopServiceDiscovery(Landroid/net/nsd/NsdManager$DiscoveryListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->stopServiceResolution(Landroid/net/nsd/NsdManager$ResolveListener;)V,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager;->unregisterOffloadEngine(Landroid/net/nsd/OffloadEngine;)V,system-api,test-api
 Landroid/net/nsd/NsdManager;->unregisterService(Landroid/net/nsd/NsdManager$RegistrationListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->unregisterServiceInfoCallback(Landroid/net/nsd/NsdManager$ServiceInfoCallback;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -2882,6 +2768,42 @@ Landroid/net/nsd/NsdServiceInfo;->setServiceName(Ljava/lang/String;)V,public-api
 Landroid/net/nsd/NsdServiceInfo;->setServiceType(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_CAPABILITY_BYPASS_MULTICAST_LOCK:I,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_TYPE_FILTER_QUERIES:I,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_TYPE_FILTER_REPLIES:I,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_TYPE_REPLY:I,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->onOffloadServiceRemoved(Landroid/net/nsd/OffloadServiceInfo;)V,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->onOffloadServiceUpdated(Landroid/net/nsd/OffloadServiceInfo;)V,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;-><init>(Ljava/lang/String;Ljava/lang/String;)V,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->describeContents()I,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->getServiceName()Ljava/lang/String;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->getServiceType()Ljava/lang/String;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;-><init>(Landroid/net/nsd/OffloadServiceInfo$Key;Ljava/util/List;Ljava/lang/String;[BIJ)V,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->describeContents()I,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getHostname()Ljava/lang/String;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getKey()Landroid/net/nsd/OffloadServiceInfo$Key;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getOffloadPayload()[B,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getOffloadType()J,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getPriority()I,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getSubtypes()Ljava/util/List;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/thread/ThreadNetworkController;->THREAD_VERSION_1_3:I,system-api,test-api
+Landroid/net/thread/ThreadNetworkController;->getThreadVersion()I,system-api,test-api
+Landroid/net/thread/ThreadNetworkManager$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/thread/ThreadNetworkManager;->getAllThreadNetworkControllers()Ljava/util/List;,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 88abd7f..f1e8da9 100644
--- a/current/hiddenapi/index.csv
+++ b/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,
@@ -104,10 +104,10 @@ Landroid/net/MacAddress;->ALL_ZEROS_ADDRESS:Landroid/net/MacAddress;,packages/mo
 Landroid/net/Network;->netId:I,packages/modules/Connectivity/framework/src/android/net/Network.java,69,5,69,25,
 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;->mNetworkCapabilities:J,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,398,5,398,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1764,5,1764,63,maxTargetSdk=28
+Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1790,5,1790,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2515,5,2515,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,256,9,256,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;->uid:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,259,9,259,29,
+Landroid/net/NetworkStats$Entry;->set:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,262,9,262,29,
+Landroid/net/NetworkStats$Entry;->tag:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,265,9,265,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;->rxBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,289,9,289,29,
+Landroid/net/NetworkStats$Entry;->rxPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,292,9,292,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;->txBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,295,9,295,29,
+Landroid/net/NetworkStats$Entry;->txPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,298,9,298,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;->operations:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,301,9,301,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;-><init>()V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,305,9,305,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->size:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,217,5,217,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->capacity:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,219,5,219,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->iface:[Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,221,5,221,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->uid:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,223,5,223,25,
+Landroid/net/NetworkStats;->set:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,225,5,225,25,
+Landroid/net/NetworkStats;->tag:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,227,5,227,25,
+Landroid/net/NetworkStats;->metered:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,229,5,229,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->roaming:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,231,5,231,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->defaultNetwork:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,233,5,233,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->rxBytes:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,235,5,235,25,
+Landroid/net/NetworkStats;->rxPackets:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,237,5,237,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->txBytes:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,239,5,239,25,
+Landroid/net/NetworkStats;->txPackets:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,241,5,241,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->operations:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,243,5,243,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;-><init>(Landroid/os/Parcel;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,558,5,558,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,735,5,735,25,
+Landroid/net/NetworkStats;->size()I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,793,5,793,25,
+Landroid/net/NetworkStats;->getUniqueUids()[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,964,5,964,25,
+Landroid/net/NetworkStats;->getTotalBytes()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,984,5,984,25,
+Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,994,5,994,25,
+Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;I)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,1004,5,1004,25,
+Landroid/net/NetworkStats;->getTotalIncludingTags(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,1019,5,1019,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,
@@ -198,8 +198,8 @@ Landroid/net/StaticIpConfiguration;->dnsServers:Ljava/util/ArrayList;,packages/m
 Landroid/net/StaticIpConfiguration;->domains:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/StaticIpConfiguration.java,52,5,52,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/TrafficStats;->getStatsService()Landroid/net/INetworkStatsService;,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,178,5,178,88,maxTargetSdk=28&trackingBug=130143562L
 Landroid/net/TrafficStats;->getMobileTcpRxPackets()J,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,684,5,684,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/TrafficStats;->getMobileTcpTxPackets()J,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,700,5,700,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/TrafficStats;->getMobileIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,1126,5,1126,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/TrafficStats;->getMobileTcpTxPackets()J,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,690,5,690,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/TrafficStats;->getMobileIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,1106,5,1106,88,maxTargetSdk=28&trackingBug=130143562L
 Landroid/net/nsd/NsdServiceInfo;->setAttribute(Ljava/lang/String;[B)V,packages/modules/Connectivity/framework-t/src/android/net/nsd/NsdServiceInfo.java,230,5,230,25,
 Lcom/android/internal/util/Preconditions;->checkArgument(Z)V,frameworks/libs/modules-utils/java/com/android/internal/util/Preconditions.java,41,5,41,25,
 Lcom/android/internal/util/Preconditions;->checkArgument(ZLjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/Preconditions.java,56,5,56,88,maxTargetSdk=30&trackingBug=170729553L
diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
index 457b96b..401c6d1 100644
--- a/current/hiddenapi/signature-patterns.csv
+++ b/current/hiddenapi/signature-patterns.csv
@@ -5,16 +5,8 @@ android/nearby/BroadcastRequest
 android/nearby/BroadcastRequestParcelable
 android/nearby/CredentialElement
 android/nearby/DataElement
-android/nearby/FastPairAccountKeyDeviceMetadata
-android/nearby/FastPairAntispoofKeyDeviceMetadata
-android/nearby/FastPairDataProviderService
 android/nearby/FastPairDevice
-android/nearby/FastPairDeviceMetadata
-android/nearby/FastPairDiscoveryItem
-android/nearby/FastPairEligibleAccount
-android/nearby/FastPairStatusCallback
 android/nearby/IBroadcastListener
-android/nearby/IFastPairHalfSheetCallback
 android/nearby/INearbyManager
 android/nearby/IScanListener
 android/nearby/NearbyDevice
@@ -22,7 +14,6 @@ android/nearby/NearbyDeviceParcelable
 android/nearby/NearbyFrameworkInitializer
 android/nearby/NearbyManager
 android/nearby/OffloadCapability
-android/nearby/PairStatusMetadata
 android/nearby/PresenceBroadcastRequest
 android/nearby/PresenceCredential
 android/nearby/PresenceDevice
@@ -133,32 +124,50 @@ 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/CronetLoggerImpl
+android/net/http/CronetStatsLog
 android/net/http/DnsOptions
-android/net/http/ExperimentalBidirectionalStream
-android/net/http/ExperimentalHttpEngine
-android/net/http/ExperimentalOptionsTranslatingHttpEngineBuilder
-android/net/http/ExperimentalUrlRequest
+android/net/http/ExperimentalOptions
 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/RateLimiter
+android/net/http/SizeBuckets
 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/**
+android/net/thread/**
 android/net/util/KeepaliveUtils
 android/net/wear/**
+android/remoteauth/**
+android/remoteauth/aidl/**
diff --git a/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar b/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
index 44c5c60..5c7c91a 100644
Binary files a/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar and b/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar differ
diff --git a/current/sdk_library/module-lib/framework-connectivity-t.srcjar b/current/sdk_library/module-lib/framework-connectivity-t.srcjar
index 6a17cc5..d5cecb0 100644
Binary files a/current/sdk_library/module-lib/framework-connectivity-t.srcjar and b/current/sdk_library/module-lib/framework-connectivity-t.srcjar differ
diff --git a/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip b/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip
index afa9904..303b74e 100644
Binary files a/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip and b/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip differ
diff --git a/current/sdk_library/public/framework-connectivity-stubs.jar b/current/sdk_library/public/framework-connectivity-stubs.jar
index 605c201..98a4049 100644
Binary files a/current/sdk_library/public/framework-connectivity-stubs.jar and b/current/sdk_library/public/framework-connectivity-stubs.jar differ
diff --git a/current/sdk_library/public/framework-connectivity-t.srcjar b/current/sdk_library/public/framework-connectivity-t.srcjar
index 38c66ab..ae4e0d7 100644
Binary files a/current/sdk_library/public/framework-connectivity-t.srcjar and b/current/sdk_library/public/framework-connectivity-t.srcjar differ
diff --git a/current/sdk_library/public/framework-connectivity.srcjar b/current/sdk_library/public/framework-connectivity.srcjar
index d01d2e4..047fc9c 100644
Binary files a/current/sdk_library/public/framework-connectivity.srcjar and b/current/sdk_library/public/framework-connectivity.srcjar differ
diff --git a/current/sdk_library/system/framework-connectivity-t-stubs.jar b/current/sdk_library/system/framework-connectivity-t-stubs.jar
index 79f0302..0b324cd 100644
Binary files a/current/sdk_library/system/framework-connectivity-t-stubs.jar and b/current/sdk_library/system/framework-connectivity-t-stubs.jar differ
diff --git a/current/sdk_library/system/framework-connectivity-t.srcjar b/current/sdk_library/system/framework-connectivity-t.srcjar
index 8a24b22..905d6b4 100644
Binary files a/current/sdk_library/system/framework-connectivity-t.srcjar and b/current/sdk_library/system/framework-connectivity-t.srcjar differ
diff --git a/current/sdk_library/system/framework-connectivity-t.txt b/current/sdk_library/system/framework-connectivity-t.txt
index 6613ee6..53ad834 100644
--- a/current/sdk_library/system/framework-connectivity-t.txt
+++ b/current/sdk_library/system/framework-connectivity-t.txt
@@ -374,3 +374,56 @@ package android.net.netstats.provider {
 
 }
 
+package android.net.nsd {
+
+  public final class NsdManager {
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void registerOffloadEngine(@NonNull String, long, long, @NonNull java.util.concurrent.Executor, @NonNull android.net.nsd.OffloadEngine);
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void unregisterOffloadEngine(@NonNull android.net.nsd.OffloadEngine);
+  }
+
+  public interface OffloadEngine {
+    method public void onOffloadServiceRemoved(@NonNull android.net.nsd.OffloadServiceInfo);
+    method public void onOffloadServiceUpdated(@NonNull android.net.nsd.OffloadServiceInfo);
+    field public static final int OFFLOAD_CAPABILITY_BYPASS_MULTICAST_LOCK = 1; // 0x1
+    field public static final int OFFLOAD_TYPE_FILTER_QUERIES = 2; // 0x2
+    field public static final int OFFLOAD_TYPE_FILTER_REPLIES = 4; // 0x4
+    field public static final int OFFLOAD_TYPE_REPLY = 1; // 0x1
+  }
+
+  public final class OffloadServiceInfo implements android.os.Parcelable {
+    ctor public OffloadServiceInfo(@NonNull android.net.nsd.OffloadServiceInfo.Key, @NonNull java.util.List<java.lang.String>, @NonNull String, @Nullable byte[], @IntRange(from=0, to=java.lang.Integer.MAX_VALUE) int, long);
+    method public int describeContents();
+    method @NonNull public String getHostname();
+    method @NonNull public android.net.nsd.OffloadServiceInfo.Key getKey();
+    method @Nullable public byte[] getOffloadPayload();
+    method public long getOffloadType();
+    method public int getPriority();
+    method @NonNull public java.util.List<java.lang.String> getSubtypes();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.nsd.OffloadServiceInfo> CREATOR;
+  }
+
+  public static final class OffloadServiceInfo.Key implements android.os.Parcelable {
+    ctor public OffloadServiceInfo.Key(@NonNull String, @NonNull String);
+    method public int describeContents();
+    method @NonNull public String getServiceName();
+    method @NonNull public String getServiceType();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.nsd.OffloadServiceInfo.Key> CREATOR;
+  }
+
+}
+
+package android.net.thread {
+
+  public class ThreadNetworkController {
+    method public int getThreadVersion();
+    field public static final int THREAD_VERSION_1_3 = 4; // 0x4
+  }
+
+  public class ThreadNetworkManager {
+    method @NonNull public java.util.List<android.net.thread.ThreadNetworkController> getAllThreadNetworkControllers();
+  }
+
+}
+
diff --git a/current/sdk_library/system/framework-connectivity-t_annotations.zip b/current/sdk_library/system/framework-connectivity-t_annotations.zip
index 9b49a69..6965557 100644
Binary files a/current/sdk_library/system/framework-connectivity-t_annotations.zip and b/current/sdk_library/system/framework-connectivity-t_annotations.zip differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 421f01b..fffc196 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10612203
\ No newline at end of file
+10917791
\ No newline at end of file
diff --git a/current/x86/lib/libnetd_updatable.so b/current/x86/lib/libnetd_updatable.so
index 422a5a2..fbf6d3d 100755
Binary files a/current/x86/lib/libnetd_updatable.so and b/current/x86/lib/libnetd_updatable.so differ
diff --git a/current/x86_64/lib/libnetd_updatable.so b/current/x86_64/lib/libnetd_updatable.so
index 43be1bb..3b84166 100755
Binary files a/current/x86_64/lib/libnetd_updatable.so and b/current/x86_64/lib/libnetd_updatable.so differ
-- 
cgit v1.2.3


From a2a83e77886063ff92512a5f7f086f30fbf7321e Mon Sep 17 00:00:00 2001
From: Alyssa Ketpreechasawat <kalyssa@google.com>
Date: Sun, 8 Oct 2023 15:08:59 +0000
Subject: Drop prebuilt files to android source tree.

The following files have been updated as part of this change:

go/current/Android.bp
go/current/snapshot-creation-build-number.txt
go/current/x86_64/lib/libnetd_updatable.so
go/current/arm/lib/libnetd_updatable.so
go/current/java_systemserver_libs/snapshot/jars/are/invalid/service-connectivity.jar
go/current/licenses/build/soong/licenses/LICENSE
go/current/x86/lib/libnetd_updatable.so
go/current/hiddenapi/annotation-flags.csv
go/current/hiddenapi/filtered-flags.csv
go/current/hiddenapi/filtered-stub-flags.csv
go/current/hiddenapi/hiddenapi-max-target-o-low-priority-tiramisu.txt
go/current/hiddenapi/hiddenapi-max-target-o-low-priority.txt
go/current/hiddenapi/hiddenapi-max-target-r-loprio.txt
go/current/hiddenapi/hiddenapi-unsupported-tiramisu.txt
go/current/hiddenapi/hiddenapi-unsupported.txt
go/current/hiddenapi/index.csv
go/current/hiddenapi/metadata.csv
go/current/hiddenapi/signature-patterns.csv
go/current/sdk_library/system/framework-connectivity-removed.txt
go/current/sdk_library/system/framework-connectivity-stubs.jar
go/current/sdk_library/system/framework-connectivity-t-removed.txt
go/current/sdk_library/system/framework-connectivity-t-stubs.jar
go/current/sdk_library/system/framework-connectivity-t.srcjar
go/current/sdk_library/system/framework-connectivity-t.txt
go/current/sdk_library/system/framework-connectivity-t_annotations.zip
go/current/sdk_library/system/framework-connectivity.srcjar
go/current/sdk_library/system/framework-connectivity.txt
go/current/sdk_library/system/framework-connectivity_annotations.zip
go/current/sdk_library/system/framework-tethering-removed.txt
go/current/sdk_library/system/framework-tethering-stubs.jar
go/current/sdk_library/system/framework-tethering.srcjar
go/current/sdk_library/system/framework-tethering.txt
go/current/sdk_library/system/framework-tethering_annotations.zip
go/current/sdk_library/module-lib/framework-connectivity-removed.txt
go/current/sdk_library/module-lib/framework-connectivity-stubs.jar
go/current/sdk_library/module-lib/framework-connectivity-t-removed.txt
go/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
go/current/sdk_library/module-lib/framework-connectivity-t.srcjar
go/current/sdk_library/module-lib/framework-connectivity-t.txt
go/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip
go/current/sdk_library/module-lib/framework-connectivity.srcjar
go/current/sdk_library/module-lib/framework-connectivity.txt
go/current/sdk_library/module-lib/framework-connectivity_annotations.zip
go/current/sdk_library/module-lib/framework-tethering-removed.txt
go/current/sdk_library/module-lib/framework-tethering-stubs.jar
go/current/sdk_library/module-lib/framework-tethering.srcjar
go/current/sdk_library/module-lib/framework-tethering.txt
go/current/sdk_library/module-lib/framework-tethering_annotations.zip
go/current/sdk_library/public/framework-connectivity-removed.txt
go/current/sdk_library/public/framework-connectivity-stubs.jar
go/current/sdk_library/public/framework-connectivity-t-removed.txt
go/current/sdk_library/public/framework-connectivity-t-stubs.jar
go/current/sdk_library/public/framework-connectivity-t.srcjar
go/current/sdk_library/public/framework-connectivity-t.txt
go/current/sdk_library/public/framework-connectivity-t_annotations.zip
go/current/sdk_library/public/framework-connectivity.srcjar
go/current/sdk_library/public/framework-connectivity.txt
go/current/sdk_library/public/framework-connectivity_annotations.zip
go/current/sdk_library/public/framework-tethering-removed.txt
go/current/sdk_library/public/framework-tethering-stubs.jar
go/current/sdk_library/public/framework-tethering.srcjar
go/current/sdk_library/public/framework-tethering.txt
go/current/sdk_library/public/framework-tethering_annotations.zip
go/current/arm64/lib/libnetd_updatable.so
go/current/compat_configs/connectivity-platform-compat-config/connectivity-platform-compat-config_meta.xml
go/current/include/packages/modules/Connectivity/netd/include/NetdUpdatablePublic.h

Built here: ab/10917791

This build IS suitable for public release.

The change is generated with prebuilt drop tool.

Test: presubmit
Change-Id: Ib4f86f7de8587e24c0456c15f744a7c52b642585
---
 .../prebuilt_info_go_current_current_zip.asciipb   |   8 +-
 go/current/arm/lib/libnetd_updatable.so            | Bin 3456 -> 3456 bytes
 go/current/arm64/lib/libnetd_updatable.so          | Bin 134696 -> 11816 bytes
 go/current/hiddenapi/filtered-flags.csv            | 394 ++++++++-------------
 go/current/hiddenapi/filtered-stub-flags.csv       | 391 ++++++++------------
 go/current/hiddenapi/index.csv                     |  84 ++---
 go/current/hiddenapi/signature-patterns.csv        |  43 ++-
 .../module-lib/framework-connectivity-t-stubs.jar  | Bin 58940 -> 62896 bytes
 .../module-lib/framework-connectivity-t.srcjar     | Bin 39023 -> 42518 bytes
 .../framework-connectivity-t_annotations.zip       | Bin 4585 -> 5246 bytes
 .../public/framework-connectivity-stubs.jar        | Bin 53850 -> 53850 bytes
 .../public/framework-connectivity-t.srcjar         | Bin 28392 -> 28391 bytes
 .../public/framework-connectivity.srcjar           | Bin 94541 -> 94505 bytes
 .../system/framework-connectivity-t-stubs.jar      | Bin 45606 -> 49562 bytes
 .../system/framework-connectivity-t.srcjar         | Bin 30729 -> 34224 bytes
 .../system/framework-connectivity-t.txt            |  53 +++
 .../framework-connectivity-t_annotations.zip       | Bin 3836 -> 4497 bytes
 go/current/snapshot-creation-build-number.txt      |   2 +-
 go/current/x86/lib/libnetd_updatable.so            | Bin 3376 -> 3376 bytes
 go/current/x86_64/lib/libnetd_updatable.so         | Bin 4320 -> 4320 bytes
 20 files changed, 438 insertions(+), 537 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..1c3c11d 100644
--- a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
@@ -1,14 +1,14 @@
 drops {
   android_build_drop {
-    build_id: "T1007188"
-    target: "train_build"
-    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.tethering/sdk/tethering-module-sdk-current.zip"
+    build_id: "10917791"
+    target: "mainline_go_modules_sdks-trunk-userdebug"
+    source_file: "mainline-sdks/for-latest-build/current/com.google.android.go.tethering/sdk/tethering-module-sdk-current.zip"
   }
   dest_file: "go/current/current.zip"
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/Connectivity"
-  git_branch: "udc-dev"
+  git_branch: "main"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/go/current/arm/lib/libnetd_updatable.so b/go/current/arm/lib/libnetd_updatable.so
index 1109346..7e1645a 100755
Binary files a/go/current/arm/lib/libnetd_updatable.so and b/go/current/arm/lib/libnetd_updatable.so differ
diff --git a/go/current/arm64/lib/libnetd_updatable.so b/go/current/arm64/lib/libnetd_updatable.so
index 38181e1..c33f694 100755
Binary files a/go/current/arm64/lib/libnetd_updatable.so and b/go/current/arm64/lib/libnetd_updatable.so differ
diff --git a/go/current/hiddenapi/filtered-flags.csv b/go/current/hiddenapi/filtered-flags.csv
index 8517709..53a4e7a 100644
--- a/go/current/hiddenapi/filtered-flags.csv
+++ b/go/current/hiddenapi/filtered-flags.csv
@@ -155,7 +155,6 @@ Landroid/nearby/DataElement;->getKey()I,sdk,system-api,test-api
 Landroid/nearby/DataElement;->getValue()[B,sdk,system-api,test-api
 Landroid/nearby/DataElement;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/nearby/DataElement;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/FastPairDataProviderService;->onBind(Landroid/content/Intent;)Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/FastPairDevice$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/nearby/FastPairDevice$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/nearby/FastPairDevice;->describeContents()I,public-api,sdk,system-api,test-api
@@ -167,10 +166,6 @@ Landroid/nearby/IBroadcastListener$Default;->asBinder()Landroid/os/IBinder;,publ
 Landroid/nearby/IBroadcastListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/IBroadcastListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/IBroadcastListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/nearby/INearbyManager$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/INearbyManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/INearbyManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
@@ -221,14 +216,6 @@ Landroid/nearby/OffloadCapability;->isFastPairSupported()Z,sdk,system-api,test-a
 Landroid/nearby/OffloadCapability;->isNearbyShareSupported()Z,sdk,system-api,test-api
 Landroid/nearby/OffloadCapability;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/nearby/OffloadCapability;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/PairStatusMetadata$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-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
 Landroid/nearby/PresenceBroadcastRequest$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/nearby/PresenceBroadcastRequest$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/nearby/PresenceBroadcastRequest$Builder;-><init>(Ljava/util/List;[BLandroid/nearby/PrivateCredential;)V,sdk,system-api,test-api
@@ -362,82 +349,6 @@ Landroid/nearby/ScanRequest;->isValidScanType(I)Z,sdk,system-api,test-api
 Landroid/nearby/ScanRequest;->scanModeToString(I)Ljava/lang/String;,sdk,system-api,test-api
 Landroid/nearby/ScanRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/nearby/ScanRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/nearby/aidl/IOffloadCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/aidl/IOffloadCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/aidl/IOffloadCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
@@ -553,6 +464,7 @@ Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda1;
 Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda2;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
 Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda3;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
 Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda4;->createService(Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
+Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda5;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
 Landroid/net/ConnectivityManager$2;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/ConnectivityManager$3;->onTetheringFailed(I)V,sdk,system-api,test-api
 Landroid/net/ConnectivityManager$3;->onTetheringStarted()V,sdk,system-api,test-api
@@ -893,16 +805,16 @@ Landroid/net/DhcpOption$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Obje
 Landroid/net/DhcpOption$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/DhcpOption;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/DhcpOption;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onCancel()V,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->onCancel()V,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->onCancel()V,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda7;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->onCancel()V,public-api,sdk,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onAnswer(Ljava/lang/Object;I)V,public-api,sdk,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onError(Landroid/net/DnsResolver$DnsException;)V,public-api,sdk,system-api,test-api
@@ -1896,7 +1808,7 @@ Landroid/net/Network;->openConnection(Ljava/net/URL;)Ljava/net/URLConnection;,pu
 Landroid/net/Network;->openConnection(Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;,public-api,sdk,system-api,test-api
 Landroid/net/Network;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/Network;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/NetworkAgent$$ExternalSyntheticLambda16;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/NetworkAgent$$ExternalSyntheticLambda15;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkAgent$NetworkAgentHandler;->handleMessage(Landroid/os/Message;)V,public-api,sdk,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;ILandroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,sdk,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;Landroid/net/NetworkScore;Landroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,sdk,system-api,test-api
@@ -2030,7 +1942,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
@@ -2355,10 +2266,13 @@ Landroid/net/NetworkStateSnapshot;->equals(Ljava/lang/Object;)Z,core-platform-ap
 Landroid/net/NetworkStateSnapshot;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 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$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,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$$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$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;,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$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
@@ -2902,7 +2816,7 @@ Landroid/net/TetheringInterface;->getType()I,sdk,system-api,test-api
 Landroid/net/TetheringInterface;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringInterface;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringInterface;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/TetheringManager$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/TetheringManager$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$3;->onReceiveResult(ILandroid/os/Bundle;)V,public-api,sdk,system-api,test-api
@@ -3013,8 +2927,6 @@ Landroid/net/TrafficStats;->TAG_SYSTEM_RESTORE:I,lo-prio,max-target-o
 Landroid/net/TrafficStats;->TB_IN_BYTES:J,lo-prio,max-target-o
 Landroid/net/TrafficStats;->TYPE_RX_BYTES:I,lo-prio,max-target-o
 Landroid/net/TrafficStats;->TYPE_RX_PACKETS:I,lo-prio,max-target-o
-Landroid/net/TrafficStats;->TYPE_TCP_RX_PACKETS:I,lo-prio,max-target-o
-Landroid/net/TrafficStats;->TYPE_TCP_TX_PACKETS:I,lo-prio,max-target-o
 Landroid/net/TrafficStats;->TYPE_TX_BYTES:I,lo-prio,max-target-o
 Landroid/net/TrafficStats;->TYPE_TX_PACKETS:I,lo-prio,max-target-o
 Landroid/net/TrafficStats;->UID_REMOVED:I,lo-prio,max-target-o
@@ -3223,11 +3135,25 @@ Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Default;->asBinde
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub$Proxy$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/net/util/DnsUtils$Rfc6724Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->println()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(I)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(Ljava/lang/String;II)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write([CII)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/internal/util/FileRotator$$ExternalSyntheticLambda0;->applyAsLong(Ljava/lang/Object;)J,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/modules/utils/HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->getZone()Ljava/time/ZoneId;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->instant()Ljava/time/Instant;,core-platform-api,public-api,sdk,system-api,test-api
@@ -3254,6 +3180,9 @@ Landroid/net/connectivity/com/android/net/module/util/IpRange;->equals(Ljava/lan
 Landroid/net/connectivity/com/android/net/module/util/IpRange;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/Struct;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/Struct;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/Struct;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/google/protobuf/AbstractMessageLite$Builder$LimitedInputStream;->available()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/google/protobuf/AbstractMessageLite$Builder$LimitedInputStream;->read()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/google/protobuf/AbstractMessageLite$Builder$LimitedInputStream;->read([BII)I,core-platform-api,public-api,sdk,system-api,test-api
@@ -3595,6 +3524,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 +3555,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 +3565,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 +3581,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 +3663,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 +3696,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 +3729,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 +3776,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 +3802,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 +3859,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 +3893,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
@@ -4058,12 +3934,16 @@ Landroid/net/nsd/INsdManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sd
 Landroid/net/nsd/INsdManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/nsd/INsdManager;,lo-prio,max-target-r
 Landroid/net/nsd/INsdManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStarted(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStopped(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onServiceFound(Landroid/net/nsd/NsdServiceInfo;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onServiceLost(Landroid/net/nsd/NsdServiceInfo;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onStartDiscoveryFailed(Ljava/lang/String;I)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onStopDiscoveryFailed(Ljava/lang/String;I)V,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$OffloadEngineProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager$OffloadEngineProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$PerNetworkDiscoveryTracker$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$PerNetworkDiscoveryTracker$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$PerNetworkDiscoveryTracker$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -4162,6 +4042,7 @@ Landroid/net/nsd/NsdManager;->mMapLock:Ljava/lang/Object;,lo-prio,max-target-o
 Landroid/net/nsd/NsdManager;->mServiceMap:Landroid/util/SparseArray;,lo-prio,max-target-o
 Landroid/net/nsd/NsdManager;->nameOf(I)Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/nsd/NsdManager;->nextListenerKey()I,lo-prio,max-target-o
+Landroid/net/nsd/NsdManager;->registerOffloadEngine(Ljava/lang/String;JJLjava/util/concurrent/Executor;Landroid/net/nsd/OffloadEngine;)V,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->registerService(Landroid/net/nsd/NsdServiceInfo;ILandroid/net/nsd/NsdManager$RegistrationListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->registerService(Landroid/net/nsd/NsdServiceInfo;ILjava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$RegistrationListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->registerServiceInfoCallback(Landroid/net/nsd/NsdServiceInfo;Ljava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$ServiceInfoCallback;)V,public-api,sdk,system-api,test-api
@@ -4170,6 +4051,7 @@ Landroid/net/nsd/NsdManager;->resolveService(Landroid/net/nsd/NsdServiceInfo;Lan
 Landroid/net/nsd/NsdManager;->resolveService(Landroid/net/nsd/NsdServiceInfo;Ljava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$ResolveListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->stopServiceDiscovery(Landroid/net/nsd/NsdManager$DiscoveryListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->stopServiceResolution(Landroid/net/nsd/NsdManager$ResolveListener;)V,public-api,sdk,system-api,test-api
+Landroid/net/nsd/NsdManager;->unregisterOffloadEngine(Landroid/net/nsd/OffloadEngine;)V,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->unregisterService(Landroid/net/nsd/NsdManager$RegistrationListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->unregisterServiceInfoCallback(Landroid/net/nsd/NsdManager$ServiceInfoCallback;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -4203,6 +4085,42 @@ Landroid/net/nsd/NsdServiceInfo;->setServiceName(Ljava/lang/String;)V,public-api
 Landroid/net/nsd/NsdServiceInfo;->setServiceType(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_CAPABILITY_BYPASS_MULTICAST_LOCK:I,sdk,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_TYPE_FILTER_QUERIES:I,sdk,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_TYPE_FILTER_REPLIES:I,sdk,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_TYPE_REPLY:I,sdk,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->onOffloadServiceRemoved(Landroid/net/nsd/OffloadServiceInfo;)V,sdk,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->onOffloadServiceUpdated(Landroid/net/nsd/OffloadServiceInfo;)V,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;-><init>(Ljava/lang/String;Ljava/lang/String;)V,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->getServiceName()Ljava/lang/String;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->getServiceType()Ljava/lang/String;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;-><init>(Landroid/net/nsd/OffloadServiceInfo$Key;Ljava/util/List;Ljava/lang/String;[BIJ)V,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getHostname()Ljava/lang/String;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getKey()Landroid/net/nsd/OffloadServiceInfo$Key;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getOffloadPayload()[B,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getOffloadType()J,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getPriority()I,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getSubtypes()Ljava/util/List;,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/thread/ThreadNetworkController;->THREAD_VERSION_1_3:I,sdk,system-api,test-api
+Landroid/net/thread/ThreadNetworkController;->getThreadVersion()I,sdk,system-api,test-api
+Landroid/net/thread/ThreadNetworkManager$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/thread/ThreadNetworkManager;->getAllThreadNetworkControllers()Ljava/util/List;,sdk,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$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..ea3683c 100644
--- a/go/current/hiddenapi/filtered-stub-flags.csv
+++ b/go/current/hiddenapi/filtered-stub-flags.csv
@@ -89,7 +89,6 @@ Landroid/nearby/DataElement;->getKey()I,system-api,test-api
 Landroid/nearby/DataElement;->getValue()[B,system-api,test-api
 Landroid/nearby/DataElement;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/nearby/DataElement;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/FastPairDataProviderService;->onBind(Landroid/content/Intent;)Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/FastPairDevice$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/nearby/FastPairDevice$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/nearby/FastPairDevice;->describeContents()I,public-api,system-api,test-api
@@ -101,10 +100,6 @@ Landroid/nearby/IBroadcastListener$Default;->asBinder()Landroid/os/IBinder;,publ
 Landroid/nearby/IBroadcastListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/IBroadcastListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/IBroadcastListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/IFastPairHalfSheetCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/nearby/INearbyManager$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/INearbyManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/INearbyManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
@@ -155,14 +150,6 @@ Landroid/nearby/OffloadCapability;->isFastPairSupported()Z,system-api,test-api
 Landroid/nearby/OffloadCapability;->isNearbyShareSupported()Z,system-api,test-api
 Landroid/nearby/OffloadCapability;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/nearby/OffloadCapability;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/PairStatusMetadata$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-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
 Landroid/nearby/PresenceBroadcastRequest$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/nearby/PresenceBroadcastRequest$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/nearby/PresenceBroadcastRequest$Builder;-><init>(Ljava/util/List;[BLandroid/nearby/PrivateCredential;)V,system-api,test-api
@@ -296,82 +283,6 @@ Landroid/nearby/ScanRequest;->isValidScanType(I)Z,system-api,test-api
 Landroid/nearby/ScanRequest;->scanModeToString(I)Ljava/lang/String;,system-api,test-api
 Landroid/nearby/ScanRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/nearby/ScanRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/ByteArrayParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountDevicesMetadataRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAccountKeyDeviceMetadataParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairAntispoofKeyDeviceMetadataRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDeviceMetadataParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairDiscoveryItemParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairEligibleAccountsRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountDeviceRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/nearby/aidl/FastPairManageAccountRequestParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAccountDevicesMetadataCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairAntispoofKeyDeviceMetadataCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairDataProvider$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairEligibleAccountsCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairManageAccountDeviceCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairStatusCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/nearby/aidl/IFastPairUiService$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/nearby/aidl/IOffloadCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/aidl/IOffloadCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/aidl/IOffloadCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
@@ -485,6 +396,7 @@ Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda1;
 Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda2;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
 Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda3;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
 Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda4;->createService(Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
+Landroid/net/ConnectivityFrameworkInitializerTiramisu$$ExternalSyntheticLambda5;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
 Landroid/net/ConnectivityManager$2;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/ConnectivityManager$3;->onTetheringFailed(I)V,system-api,test-api
 Landroid/net/ConnectivityManager$3;->onTetheringStarted()V,system-api,test-api
@@ -649,16 +561,16 @@ Landroid/net/DhcpOption$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Obje
 Landroid/net/DhcpOption$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/DhcpOption;->describeContents()I,public-api,system-api,test-api
 Landroid/net/DhcpOption;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onCancel()V,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda0;->onCancel()V,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda10;->onCancel()V,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda1;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->onFileDescriptorEvents(Ljava/io/FileDescriptor;I)I,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda7;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->onCancel()V,public-api,system-api,test-api
+Landroid/net/DnsResolver$$ExternalSyntheticLambda8;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onAnswer(Ljava/lang/Object;I)V,public-api,system-api,test-api
 Landroid/net/DnsResolver$Callback;->onError(Landroid/net/DnsResolver$DnsException;)V,public-api,system-api,test-api
@@ -1099,7 +1011,7 @@ Landroid/net/Network;->openConnection(Ljava/net/URL;)Ljava/net/URLConnection;,pu
 Landroid/net/Network;->openConnection(Ljava/net/URL;Ljava/net/Proxy;)Ljava/net/URLConnection;,public-api,system-api,test-api
 Landroid/net/Network;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/Network;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/NetworkAgent$$ExternalSyntheticLambda16;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/NetworkAgent$$ExternalSyntheticLambda15;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkAgent$NetworkAgentHandler;->handleMessage(Landroid/os/Message;)V,public-api,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;ILandroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,system-api,test-api
 Landroid/net/NetworkAgent;-><init>(Landroid/content/Context;Landroid/os/Looper;Ljava/lang/String;Landroid/net/NetworkCapabilities;Landroid/net/LinkProperties;Landroid/net/NetworkScore;Landroid/net/NetworkAgentConfig;Landroid/net/NetworkProvider;)V,system-api,test-api
@@ -1392,10 +1304,13 @@ Landroid/net/NetworkStateSnapshot;->equals(Ljava/lang/Object;)Z,core-platform-ap
 Landroid/net/NetworkStateSnapshot;->hashCode()I,core-platform-api,public-api,system-api,test-api
 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$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,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$$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$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;,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$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
@@ -1689,7 +1604,7 @@ Landroid/net/TetheringInterface;->getType()I,system-api,test-api
 Landroid/net/TetheringInterface;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringInterface;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringInterface;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/TetheringManager$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/TetheringManager$$ExternalSyntheticLambda9;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$3;->onReceiveResult(ILandroid/os/Bundle;)V,public-api,system-api,test-api
@@ -1969,11 +1884,25 @@ Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Default;->asBinde
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/IOffloadEngine$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkController$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub$Proxy$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/thread/IThreadNetworkManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/net/connectivity/android/net/util/DnsUtils$Rfc6724Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->println()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(I)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(Ljava/lang/String;II)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write([CII)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/internal/util/FileRotator$$ExternalSyntheticLambda0;->applyAsLong(Ljava/lang/Object;)J,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/modules/utils/HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->getZone()Ljava/time/ZoneId;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/BestClock;->instant()Ljava/time/Instant;,core-platform-api,public-api,system-api,test-api
@@ -2000,6 +1929,9 @@ Landroid/net/connectivity/com/android/net/module/util/IpRange;->equals(Ljava/lan
 Landroid/net/connectivity/com/android/net/module/util/IpRange;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/Struct;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/Struct;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/com/android/net/module/util/Struct;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/google/protobuf/AbstractMessageLite$Builder$LimitedInputStream;->available()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/google/protobuf/AbstractMessageLite$Builder$LimitedInputStream;->read()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/google/protobuf/AbstractMessageLite$Builder$LimitedInputStream;->read([BII)I,core-platform-api,public-api,system-api,test-api
@@ -2326,6 +2258,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 +2289,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 +2299,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 +2315,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 +2397,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 +2430,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 +2463,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 +2510,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 +2536,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 +2593,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 +2627,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
@@ -2783,12 +2662,16 @@ Landroid/net/nsd/INsdManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-
 Landroid/net/nsd/INsdManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/nsd/INsdManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStarted(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStopped(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onServiceFound(Landroid/net/nsd/NsdServiceInfo;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onServiceLost(Landroid/net/nsd/NsdServiceInfo;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onStartDiscoveryFailed(Ljava/lang/String;I)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onStopDiscoveryFailed(Ljava/lang/String;I)V,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$OffloadEngineProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager$OffloadEngineProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$PerNetworkDiscoveryTracker$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$PerNetworkDiscoveryTracker$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$PerNetworkDiscoveryTracker$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
@@ -2852,6 +2735,7 @@ Landroid/net/nsd/NsdManager;->PROTOCOL_DNS_SD:I,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->discoverServices(Ljava/lang/String;ILandroid/net/Network;Ljava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$DiscoveryListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->discoverServices(Ljava/lang/String;ILandroid/net/NetworkRequest;Ljava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$DiscoveryListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->discoverServices(Ljava/lang/String;ILandroid/net/nsd/NsdManager$DiscoveryListener;)V,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager;->registerOffloadEngine(Ljava/lang/String;JJLjava/util/concurrent/Executor;Landroid/net/nsd/OffloadEngine;)V,system-api,test-api
 Landroid/net/nsd/NsdManager;->registerService(Landroid/net/nsd/NsdServiceInfo;ILandroid/net/nsd/NsdManager$RegistrationListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->registerService(Landroid/net/nsd/NsdServiceInfo;ILjava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$RegistrationListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->registerServiceInfoCallback(Landroid/net/nsd/NsdServiceInfo;Ljava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$ServiceInfoCallback;)V,public-api,system-api,test-api
@@ -2859,6 +2743,7 @@ Landroid/net/nsd/NsdManager;->resolveService(Landroid/net/nsd/NsdServiceInfo;Lan
 Landroid/net/nsd/NsdManager;->resolveService(Landroid/net/nsd/NsdServiceInfo;Ljava/util/concurrent/Executor;Landroid/net/nsd/NsdManager$ResolveListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->stopServiceDiscovery(Landroid/net/nsd/NsdManager$DiscoveryListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->stopServiceResolution(Landroid/net/nsd/NsdManager$ResolveListener;)V,public-api,system-api,test-api
+Landroid/net/nsd/NsdManager;->unregisterOffloadEngine(Landroid/net/nsd/OffloadEngine;)V,system-api,test-api
 Landroid/net/nsd/NsdManager;->unregisterService(Landroid/net/nsd/NsdManager$RegistrationListener;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager;->unregisterServiceInfoCallback(Landroid/net/nsd/NsdManager$ServiceInfoCallback;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -2883,6 +2768,42 @@ Landroid/net/nsd/NsdServiceInfo;->setServiceName(Ljava/lang/String;)V,public-api
 Landroid/net/nsd/NsdServiceInfo;->setServiceType(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_CAPABILITY_BYPASS_MULTICAST_LOCK:I,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_TYPE_FILTER_QUERIES:I,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_TYPE_FILTER_REPLIES:I,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->OFFLOAD_TYPE_REPLY:I,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->onOffloadServiceRemoved(Landroid/net/nsd/OffloadServiceInfo;)V,system-api,test-api
+Landroid/net/nsd/OffloadEngine;->onOffloadServiceUpdated(Landroid/net/nsd/OffloadServiceInfo;)V,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;-><init>(Ljava/lang/String;Ljava/lang/String;)V,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->describeContents()I,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->getServiceName()Ljava/lang/String;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->getServiceType()Ljava/lang/String;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo$Key;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;-><init>(Landroid/net/nsd/OffloadServiceInfo$Key;Ljava/util/List;Ljava/lang/String;[BIJ)V,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->describeContents()I,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getHostname()Ljava/lang/String;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getKey()Landroid/net/nsd/OffloadServiceInfo$Key;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getOffloadPayload()[B,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getOffloadType()J,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getPriority()I,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->getSubtypes()Ljava/util/List;,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/nsd/OffloadServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/thread/ThreadNetworkController;->THREAD_VERSION_1_3:I,system-api,test-api
+Landroid/net/thread/ThreadNetworkController;->getThreadVersion()I,system-api,test-api
+Landroid/net/thread/ThreadNetworkManager$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/thread/ThreadNetworkManager;->getAllThreadNetworkControllers()Ljava/util/List;,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wear/ICompanionDeviceManagerProxy$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..f1e8da9 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,
@@ -104,10 +104,10 @@ Landroid/net/MacAddress;->ALL_ZEROS_ADDRESS:Landroid/net/MacAddress;,packages/mo
 Landroid/net/Network;->netId:I,packages/modules/Connectivity/framework/src/android/net/Network.java,69,5,69,25,
 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;->mNetworkCapabilities:J,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,398,5,398,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1764,5,1764,63,maxTargetSdk=28
+Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1790,5,1790,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2515,5,2515,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,256,9,256,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;->uid:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,259,9,259,29,
+Landroid/net/NetworkStats$Entry;->set:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,262,9,262,29,
+Landroid/net/NetworkStats$Entry;->tag:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,265,9,265,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;->rxBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,289,9,289,29,
+Landroid/net/NetworkStats$Entry;->rxPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,292,9,292,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;->txBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,295,9,295,29,
+Landroid/net/NetworkStats$Entry;->txPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,298,9,298,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;->operations:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,301,9,301,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats$Entry;-><init>()V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,305,9,305,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->size:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,217,5,217,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->capacity:I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,219,5,219,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->iface:[Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,221,5,221,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->uid:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,223,5,223,25,
+Landroid/net/NetworkStats;->set:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,225,5,225,25,
+Landroid/net/NetworkStats;->tag:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,227,5,227,25,
+Landroid/net/NetworkStats;->metered:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,229,5,229,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->roaming:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,231,5,231,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->defaultNetwork:[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,233,5,233,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->rxBytes:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,235,5,235,25,
+Landroid/net/NetworkStats;->rxPackets:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,237,5,237,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->txBytes:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,239,5,239,25,
+Landroid/net/NetworkStats;->txPackets:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,241,5,241,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->operations:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,243,5,243,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;-><init>(Landroid/os/Parcel;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,558,5,558,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,735,5,735,25,
+Landroid/net/NetworkStats;->size()I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,793,5,793,25,
+Landroid/net/NetworkStats;->getUniqueUids()[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,964,5,964,25,
+Landroid/net/NetworkStats;->getTotalBytes()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,984,5,984,25,
+Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,994,5,994,25,
+Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;I)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,1004,5,1004,25,
+Landroid/net/NetworkStats;->getTotalIncludingTags(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,1019,5,1019,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,
@@ -198,8 +198,8 @@ Landroid/net/StaticIpConfiguration;->dnsServers:Ljava/util/ArrayList;,packages/m
 Landroid/net/StaticIpConfiguration;->domains:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/StaticIpConfiguration.java,52,5,52,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/TrafficStats;->getStatsService()Landroid/net/INetworkStatsService;,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,178,5,178,88,maxTargetSdk=28&trackingBug=130143562L
 Landroid/net/TrafficStats;->getMobileTcpRxPackets()J,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,684,5,684,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/TrafficStats;->getMobileTcpTxPackets()J,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,700,5,700,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/TrafficStats;->getMobileIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,1126,5,1126,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/TrafficStats;->getMobileTcpTxPackets()J,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,690,5,690,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/TrafficStats;->getMobileIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/TrafficStats.java,1106,5,1106,88,maxTargetSdk=28&trackingBug=130143562L
 Landroid/net/nsd/NsdServiceInfo;->setAttribute(Ljava/lang/String;[B)V,packages/modules/Connectivity/framework-t/src/android/net/nsd/NsdServiceInfo.java,230,5,230,25,
 Lcom/android/internal/util/Preconditions;->checkArgument(Z)V,frameworks/libs/modules-utils/java/com/android/internal/util/Preconditions.java,41,5,41,25,
 Lcom/android/internal/util/Preconditions;->checkArgument(ZLjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/Preconditions.java,56,5,56,88,maxTargetSdk=30&trackingBug=170729553L
diff --git a/go/current/hiddenapi/signature-patterns.csv b/go/current/hiddenapi/signature-patterns.csv
index 457b96b..401c6d1 100644
--- a/go/current/hiddenapi/signature-patterns.csv
+++ b/go/current/hiddenapi/signature-patterns.csv
@@ -5,16 +5,8 @@ android/nearby/BroadcastRequest
 android/nearby/BroadcastRequestParcelable
 android/nearby/CredentialElement
 android/nearby/DataElement
-android/nearby/FastPairAccountKeyDeviceMetadata
-android/nearby/FastPairAntispoofKeyDeviceMetadata
-android/nearby/FastPairDataProviderService
 android/nearby/FastPairDevice
-android/nearby/FastPairDeviceMetadata
-android/nearby/FastPairDiscoveryItem
-android/nearby/FastPairEligibleAccount
-android/nearby/FastPairStatusCallback
 android/nearby/IBroadcastListener
-android/nearby/IFastPairHalfSheetCallback
 android/nearby/INearbyManager
 android/nearby/IScanListener
 android/nearby/NearbyDevice
@@ -22,7 +14,6 @@ android/nearby/NearbyDeviceParcelable
 android/nearby/NearbyFrameworkInitializer
 android/nearby/NearbyManager
 android/nearby/OffloadCapability
-android/nearby/PairStatusMetadata
 android/nearby/PresenceBroadcastRequest
 android/nearby/PresenceCredential
 android/nearby/PresenceDevice
@@ -133,32 +124,50 @@ 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/CronetLoggerImpl
+android/net/http/CronetStatsLog
 android/net/http/DnsOptions
-android/net/http/ExperimentalBidirectionalStream
-android/net/http/ExperimentalHttpEngine
-android/net/http/ExperimentalOptionsTranslatingHttpEngineBuilder
-android/net/http/ExperimentalUrlRequest
+android/net/http/ExperimentalOptions
 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/RateLimiter
+android/net/http/SizeBuckets
 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/**
+android/net/thread/**
 android/net/util/KeepaliveUtils
 android/net/wear/**
+android/remoteauth/**
+android/remoteauth/aidl/**
diff --git a/go/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar b/go/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
index 44c5c60..5c7c91a 100644
Binary files a/go/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar and b/go/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar differ
diff --git a/go/current/sdk_library/module-lib/framework-connectivity-t.srcjar b/go/current/sdk_library/module-lib/framework-connectivity-t.srcjar
index 6a17cc5..d5cecb0 100644
Binary files a/go/current/sdk_library/module-lib/framework-connectivity-t.srcjar and b/go/current/sdk_library/module-lib/framework-connectivity-t.srcjar differ
diff --git a/go/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip b/go/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip
index afa9904..303b74e 100644
Binary files a/go/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip and b/go/current/sdk_library/module-lib/framework-connectivity-t_annotations.zip differ
diff --git a/go/current/sdk_library/public/framework-connectivity-stubs.jar b/go/current/sdk_library/public/framework-connectivity-stubs.jar
index 605c201..98a4049 100644
Binary files a/go/current/sdk_library/public/framework-connectivity-stubs.jar and b/go/current/sdk_library/public/framework-connectivity-stubs.jar differ
diff --git a/go/current/sdk_library/public/framework-connectivity-t.srcjar b/go/current/sdk_library/public/framework-connectivity-t.srcjar
index 38c66ab..ae4e0d7 100644
Binary files a/go/current/sdk_library/public/framework-connectivity-t.srcjar and b/go/current/sdk_library/public/framework-connectivity-t.srcjar differ
diff --git a/go/current/sdk_library/public/framework-connectivity.srcjar b/go/current/sdk_library/public/framework-connectivity.srcjar
index d01d2e4..047fc9c 100644
Binary files a/go/current/sdk_library/public/framework-connectivity.srcjar and b/go/current/sdk_library/public/framework-connectivity.srcjar differ
diff --git a/go/current/sdk_library/system/framework-connectivity-t-stubs.jar b/go/current/sdk_library/system/framework-connectivity-t-stubs.jar
index 79f0302..0b324cd 100644
Binary files a/go/current/sdk_library/system/framework-connectivity-t-stubs.jar and b/go/current/sdk_library/system/framework-connectivity-t-stubs.jar differ
diff --git a/go/current/sdk_library/system/framework-connectivity-t.srcjar b/go/current/sdk_library/system/framework-connectivity-t.srcjar
index 8a24b22..905d6b4 100644
Binary files a/go/current/sdk_library/system/framework-connectivity-t.srcjar and b/go/current/sdk_library/system/framework-connectivity-t.srcjar differ
diff --git a/go/current/sdk_library/system/framework-connectivity-t.txt b/go/current/sdk_library/system/framework-connectivity-t.txt
index 6613ee6..53ad834 100644
--- a/go/current/sdk_library/system/framework-connectivity-t.txt
+++ b/go/current/sdk_library/system/framework-connectivity-t.txt
@@ -374,3 +374,56 @@ package android.net.netstats.provider {
 
 }
 
+package android.net.nsd {
+
+  public final class NsdManager {
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void registerOffloadEngine(@NonNull String, long, long, @NonNull java.util.concurrent.Executor, @NonNull android.net.nsd.OffloadEngine);
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void unregisterOffloadEngine(@NonNull android.net.nsd.OffloadEngine);
+  }
+
+  public interface OffloadEngine {
+    method public void onOffloadServiceRemoved(@NonNull android.net.nsd.OffloadServiceInfo);
+    method public void onOffloadServiceUpdated(@NonNull android.net.nsd.OffloadServiceInfo);
+    field public static final int OFFLOAD_CAPABILITY_BYPASS_MULTICAST_LOCK = 1; // 0x1
+    field public static final int OFFLOAD_TYPE_FILTER_QUERIES = 2; // 0x2
+    field public static final int OFFLOAD_TYPE_FILTER_REPLIES = 4; // 0x4
+    field public static final int OFFLOAD_TYPE_REPLY = 1; // 0x1
+  }
+
+  public final class OffloadServiceInfo implements android.os.Parcelable {
+    ctor public OffloadServiceInfo(@NonNull android.net.nsd.OffloadServiceInfo.Key, @NonNull java.util.List<java.lang.String>, @NonNull String, @Nullable byte[], @IntRange(from=0, to=java.lang.Integer.MAX_VALUE) int, long);
+    method public int describeContents();
+    method @NonNull public String getHostname();
+    method @NonNull public android.net.nsd.OffloadServiceInfo.Key getKey();
+    method @Nullable public byte[] getOffloadPayload();
+    method public long getOffloadType();
+    method public int getPriority();
+    method @NonNull public java.util.List<java.lang.String> getSubtypes();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.nsd.OffloadServiceInfo> CREATOR;
+  }
+
+  public static final class OffloadServiceInfo.Key implements android.os.Parcelable {
+    ctor public OffloadServiceInfo.Key(@NonNull String, @NonNull String);
+    method public int describeContents();
+    method @NonNull public String getServiceName();
+    method @NonNull public String getServiceType();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.nsd.OffloadServiceInfo.Key> CREATOR;
+  }
+
+}
+
+package android.net.thread {
+
+  public class ThreadNetworkController {
+    method public int getThreadVersion();
+    field public static final int THREAD_VERSION_1_3 = 4; // 0x4
+  }
+
+  public class ThreadNetworkManager {
+    method @NonNull public java.util.List<android.net.thread.ThreadNetworkController> getAllThreadNetworkControllers();
+  }
+
+}
+
diff --git a/go/current/sdk_library/system/framework-connectivity-t_annotations.zip b/go/current/sdk_library/system/framework-connectivity-t_annotations.zip
index 9b49a69..6965557 100644
Binary files a/go/current/sdk_library/system/framework-connectivity-t_annotations.zip and b/go/current/sdk_library/system/framework-connectivity-t_annotations.zip differ
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index f9eedbc..fffc196 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
+10917791
\ No newline at end of file
diff --git a/go/current/x86/lib/libnetd_updatable.so b/go/current/x86/lib/libnetd_updatable.so
index 422a5a2..fbf6d3d 100755
Binary files a/go/current/x86/lib/libnetd_updatable.so and b/go/current/x86/lib/libnetd_updatable.so differ
diff --git a/go/current/x86_64/lib/libnetd_updatable.so b/go/current/x86_64/lib/libnetd_updatable.so
index 43be1bb..3b84166 100755
Binary files a/go/current/x86_64/lib/libnetd_updatable.so and b/go/current/x86_64/lib/libnetd_updatable.so differ
-- 
cgit v1.2.3