Merge cherrypicks of [16738090, 16738091] into sc-v2-release.android-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-platform-12.1.0_r3android-platform-12.1.0_r2android-platform-12.1.0_r1android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r2android-12.1.0_r1android12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-gsi

Change-Id: I7625741c80ff4a3bbdf79eac51688126d6683225

24 files changed, 295 insertions, 131 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index c71b02d..4bd935f 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,8 +1,8 @@
 drops {
   android_build_drop {
-    build_id: "7727475"
+    build_id: "7936552"
     target: "mainline_modules-user"
-    source_file: "mainline-sdks/tethering-module-sdk-current.zip"
+    source_file: "mainline-sdks/current/com.google.android.tethering/sdk/tethering-module-sdk-current.zip"
   }
   dest_file: "current/current.zip"
   version: ""
diff --git a/current/Android.bp b/current/Android.bp
index f7282a9..7371c7c 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,11 +1,6 @@
 // This is auto-generated. DO NOT EDIT.
 
-package {
-    // A default list here prevents the license LSC from adding its own list which would
-    // be unnecessary as every module in the sdk already has its own licenses property.
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
 soong_config_module_type_import {
     from: "packages/modules/common/Android.bp",
     module_types: [
@@ -14,6 +9,12 @@ soong_config_module_type_import {
     ],
 }
 
+package {
+    // A default list here prevents the license LSC from adding its own list which would
+    // be unnecessary as every module in the sdk already has its own licenses property.
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 prebuilt_bootclasspath_fragment {
     name: "tethering-module-sdk_com.android.tethering-bootclasspath-fragment@current",
     sdk_member_name: "com.android.tethering-bootclasspath-fragment",
@@ -37,6 +38,7 @@ prebuilt_bootclasspath_fragment {
 
 module_prebuilt_bootclasspath_fragment {
     name: "com.android.tethering-bootclasspath-fragment",
+    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {
@@ -94,6 +96,7 @@ java_sdk_library_import {
 
 module_java_sdk_library_import {
     name: "framework-connectivity",
+    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {
@@ -161,7 +164,8 @@ java_sdk_library_import {
 
 module_java_sdk_library_import {
     name: "framework-tethering",
-    prefer: false,
+    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
+    prefer: true,
     soong_config_variables: {
         module_build_from_source: {
             prefer: false,
diff --git a/current/Android.bp.auto b/current/Android.bp.auto
index c8ecddf..92ccf84 100755..100644
--- a/current/Android.bp.auto
+++ b/current/Android.bp.auto
@@ -1,5 +1,14 @@
 // This is auto-generated. DO NOT EDIT.
 
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type_import {
+    from: "packages/modules/common/Android.bp",
+    module_types: [
+        "module_java_sdk_library_import",
+        "module_prebuilt_bootclasspath_fragment",
+    ],
+}
+
 package {
     // A default list here prevents the license LSC from adding its own list which would
     // be unnecessary as every module in the sdk already has its own licenses property.
@@ -27,9 +36,15 @@ prebuilt_bootclasspath_fragment {
     },
 }
 
-prebuilt_bootclasspath_fragment {
+module_prebuilt_bootclasspath_fragment {
     name: "com.android.tethering-bootclasspath-fragment",
-    prefer: false,
+    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
+    prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0"],
@@ -61,6 +76,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/public/framework-connectivity.srcjar"],
         current_api: "sdk_library/public/framework-connectivity.txt",
         removed_api: "sdk_library/public/framework-connectivity-removed.txt",
+        annotations: "sdk_library/public/framework-connectivity_annotations.zip",
         sdk_version: "module_current",
     },
     system: {
@@ -68,6 +84,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/system/framework-connectivity.srcjar"],
         current_api: "sdk_library/system/framework-connectivity.txt",
         removed_api: "sdk_library/system/framework-connectivity-removed.txt",
+        annotations: "sdk_library/system/framework-connectivity_annotations.zip",
         sdk_version: "module_current",
     },
     module_lib: {
@@ -75,13 +92,20 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/module-lib/framework-connectivity.srcjar"],
         current_api: "sdk_library/module-lib/framework-connectivity.txt",
         removed_api: "sdk_library/module-lib/framework-connectivity-removed.txt",
+        annotations: "sdk_library/module-lib/framework-connectivity_annotations.zip",
         sdk_version: "module_current",
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "framework-connectivity",
-    prefer: false,
+    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
+    prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0"],
@@ -92,6 +116,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/public/framework-connectivity.srcjar"],
         current_api: "sdk_library/public/framework-connectivity.txt",
         removed_api: "sdk_library/public/framework-connectivity-removed.txt",
+        annotations: "sdk_library/public/framework-connectivity_annotations.zip",
         sdk_version: "module_current",
     },
     system: {
@@ -99,6 +124,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/system/framework-connectivity.srcjar"],
         current_api: "sdk_library/system/framework-connectivity.txt",
         removed_api: "sdk_library/system/framework-connectivity-removed.txt",
+        annotations: "sdk_library/system/framework-connectivity_annotations.zip",
         sdk_version: "module_current",
     },
     module_lib: {
@@ -106,6 +132,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/module-lib/framework-connectivity.srcjar"],
         current_api: "sdk_library/module-lib/framework-connectivity.txt",
         removed_api: "sdk_library/module-lib/framework-connectivity-removed.txt",
+        annotations: "sdk_library/module-lib/framework-connectivity_annotations.zip",
         sdk_version: "module_current",
     },
 }
@@ -123,6 +150,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/public/framework-tethering.srcjar"],
         current_api: "sdk_library/public/framework-tethering.txt",
         removed_api: "sdk_library/public/framework-tethering-removed.txt",
+        annotations: "sdk_library/public/framework-tethering_annotations.zip",
         sdk_version: "module_current",
     },
     system: {
@@ -130,6 +158,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/system/framework-tethering.srcjar"],
         current_api: "sdk_library/system/framework-tethering.txt",
         removed_api: "sdk_library/system/framework-tethering-removed.txt",
+        annotations: "sdk_library/system/framework-tethering_annotations.zip",
         sdk_version: "module_current",
     },
     module_lib: {
@@ -137,13 +166,20 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/module-lib/framework-tethering.srcjar"],
         current_api: "sdk_library/module-lib/framework-tethering.txt",
         removed_api: "sdk_library/module-lib/framework-tethering-removed.txt",
+        annotations: "sdk_library/module-lib/framework-tethering_annotations.zip",
         sdk_version: "module_current",
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "framework-tethering",
-    prefer: false,
+    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
+    prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0"],
@@ -154,6 +190,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/public/framework-tethering.srcjar"],
         current_api: "sdk_library/public/framework-tethering.txt",
         removed_api: "sdk_library/public/framework-tethering-removed.txt",
+        annotations: "sdk_library/public/framework-tethering_annotations.zip",
         sdk_version: "module_current",
     },
     system: {
@@ -161,6 +198,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/system/framework-tethering.srcjar"],
         current_api: "sdk_library/system/framework-tethering.txt",
         removed_api: "sdk_library/system/framework-tethering-removed.txt",
+        annotations: "sdk_library/system/framework-tethering_annotations.zip",
         sdk_version: "module_current",
     },
     module_lib: {
@@ -168,6 +206,7 @@ java_sdk_library_import {
         stub_srcs: ["sdk_library/module-lib/framework-tethering.srcjar"],
         current_api: "sdk_library/module-lib/framework-tethering.txt",
         removed_api: "sdk_library/module-lib/framework-tethering-removed.txt",
+        annotations: "sdk_library/module-lib/framework-tethering_annotations.zip",
         sdk_version: "module_current",
     },
 }
diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index c00a152..f814136 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv
@@ -1598,6 +1598,7 @@ Landroid/net/ITetheringConnector$Default;->asBinder()Landroid/os/IBinder;,public
 Landroid/net/ITetheringConnector$Default;->isTetheringSupported(Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V,blocked
 Landroid/net/ITetheringConnector$Default;->registerTetheringEventCallback(Landroid/net/ITetheringEventCallback;Ljava/lang/String;)V,blocked
 Landroid/net/ITetheringConnector$Default;->requestLatestTetheringEntitlementResult(ILandroid/os/ResultReceiver;ZLjava/lang/String;Ljava/lang/String;)V,blocked
+Landroid/net/ITetheringConnector$Default;->setPreferTestNetworks(ZLandroid/net/IIntResultListener;)V,blocked
 Landroid/net/ITetheringConnector$Default;->setUsbTethering(ZLjava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V,blocked
 Landroid/net/ITetheringConnector$Default;->startTethering(Landroid/net/TetheringRequestParcel;Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V,blocked
 Landroid/net/ITetheringConnector$Default;->stopAllTethering(Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V,blocked
@@ -1613,6 +1614,7 @@ Landroid/net/ITetheringConnector$Stub$Proxy;->mRemote:Landroid/os/IBinder;,block
 Landroid/net/ITetheringConnector$Stub$Proxy;->registerTetheringEventCallback(Landroid/net/ITetheringEventCallback;Ljava/lang/String;)V,blocked
 Landroid/net/ITetheringConnector$Stub$Proxy;->requestLatestTetheringEntitlementResult(ILandroid/os/ResultReceiver;ZLjava/lang/String;Ljava/lang/String;)V,blocked
 Landroid/net/ITetheringConnector$Stub$Proxy;->sDefaultImpl:Landroid/net/ITetheringConnector;,blocked
+Landroid/net/ITetheringConnector$Stub$Proxy;->setPreferTestNetworks(ZLandroid/net/IIntResultListener;)V,blocked
 Landroid/net/ITetheringConnector$Stub$Proxy;->setUsbTethering(ZLjava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V,blocked
 Landroid/net/ITetheringConnector$Stub$Proxy;->startTethering(Landroid/net/TetheringRequestParcel;Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V,blocked
 Landroid/net/ITetheringConnector$Stub$Proxy;->stopAllTethering(Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V,blocked
@@ -1624,6 +1626,7 @@ Landroid/net/ITetheringConnector$Stub;-><init>()V,blocked
 Landroid/net/ITetheringConnector$Stub;->TRANSACTION_isTetheringSupported:I,blocked
 Landroid/net/ITetheringConnector$Stub;->TRANSACTION_registerTetheringEventCallback:I,blocked
 Landroid/net/ITetheringConnector$Stub;->TRANSACTION_requestLatestTetheringEntitlementResult:I,blocked
+Landroid/net/ITetheringConnector$Stub;->TRANSACTION_setPreferTestNetworks:I,blocked
 Landroid/net/ITetheringConnector$Stub;->TRANSACTION_setUsbTethering:I,blocked
 Landroid/net/ITetheringConnector$Stub;->TRANSACTION_startTethering:I,blocked
 Landroid/net/ITetheringConnector$Stub;->TRANSACTION_stopAllTethering:I,blocked
@@ -1640,6 +1643,7 @@ Landroid/net/ITetheringConnector;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/ITetheringConnector;->isTetheringSupported(Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V,blocked
 Landroid/net/ITetheringConnector;->registerTetheringEventCallback(Landroid/net/ITetheringEventCallback;Ljava/lang/String;)V,blocked
 Landroid/net/ITetheringConnector;->requestLatestTetheringEntitlementResult(ILandroid/os/ResultReceiver;ZLjava/lang/String;Ljava/lang/String;)V,blocked
+Landroid/net/ITetheringConnector;->setPreferTestNetworks(ZLandroid/net/IIntResultListener;)V,blocked
 Landroid/net/ITetheringConnector;->setUsbTethering(ZLjava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V,blocked
 Landroid/net/ITetheringConnector;->startTethering(Landroid/net/TetheringRequestParcel;Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V,blocked
 Landroid/net/ITetheringConnector;->stopAllTethering(Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V,blocked
@@ -2401,6 +2405,7 @@ Landroid/net/NetworkCapabilities$Builder;->setSsid(Ljava/lang/String;)Landroid/n
 Landroid/net/NetworkCapabilities$Builder;->setSubscriptionIds(Ljava/util/Set;)Landroid/net/NetworkCapabilities$Builder;,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities$Builder;->setTransportInfo(Landroid/net/TransportInfo;)Landroid/net/NetworkCapabilities$Builder;,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities$Builder;->setUids(Ljava/util/Set;)Landroid/net/NetworkCapabilities$Builder;,blocked
+Landroid/net/NetworkCapabilities$Builder;->setUnderlyingNetworks(Ljava/util/List;)Landroid/net/NetworkCapabilities$Builder;,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities$Builder;->withoutDefaultCapabilities()Landroid/net/NetworkCapabilities$Builder;,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities$NameOf;->nameOf(I)Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;-><clinit>()V,blocked
@@ -2529,6 +2534,7 @@ Landroid/net/NetworkCapabilities;->equalsSubscriptionIds(Landroid/net/NetworkCap
 Landroid/net/NetworkCapabilities;->equalsTransportInfo(Landroid/net/NetworkCapabilities;)Z,blocked
 Landroid/net/NetworkCapabilities;->equalsTransportTypes(Landroid/net/NetworkCapabilities;)Z,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->equalsUids(Landroid/net/NetworkCapabilities;)Z,lo-prio,max-target-o
+Landroid/net/NetworkCapabilities;->equalsUnderlyingNetworks(Landroid/net/NetworkCapabilities;)Z,blocked
 Landroid/net/NetworkCapabilities;->getAdministratorUids()[I,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities;->getApplicableRedactions()J,blocked
 Landroid/net/NetworkCapabilities;->getCapabilities()[I,public-api,sdk,system-api,test-api
@@ -2547,11 +2553,13 @@ Landroid/net/NetworkCapabilities;->getTransportInfo()Landroid/net/TransportInfo;
 Landroid/net/NetworkCapabilities;->getTransportTypes()[I,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities;->getUidRanges()Ljava/util/Set;,blocked
 Landroid/net/NetworkCapabilities;->getUids()Ljava/util/Set;,lo-prio,max-target-o
+Landroid/net/NetworkCapabilities;->getUnderlyingNetworks()Ljava/util/List;,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities;->hasCapability(I)Z,public-api,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities;->hasConnectivityManagedCapability()Z,blocked
 Landroid/net/NetworkCapabilities;->hasForbiddenCapability(I)Z,blocked
 Landroid/net/NetworkCapabilities;->hasSameUids(Landroid/net/NetworkCapabilities;Landroid/net/NetworkCapabilities;)Z,blocked
 Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,max-target-r
+Landroid/net/NetworkCapabilities;->hasSingleTransport(I)Z,blocked
 Landroid/net/NetworkCapabilities;->hasTransport(I)Z,public-api,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities;->isMetered()Z,blocked
@@ -2574,6 +2582,7 @@ Landroid/net/NetworkCapabilities;->mSubIds:Landroid/util/ArraySet;,blocked
 Landroid/net/NetworkCapabilities;->mTransportInfo:Landroid/net/TransportInfo;,blocked
 Landroid/net/NetworkCapabilities;->mTransportTypes:J,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->mUids:Landroid/util/ArraySet;,lo-prio,max-target-o
+Landroid/net/NetworkCapabilities;->mUnderlyingNetworks:Ljava/util/List;,blocked
 Landroid/net/NetworkCapabilities;->maxBandwidth(II)I,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->maybeMarkCapabilitiesRestricted()V,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->minBandwidth(II)I,lo-prio,max-target-o
@@ -2616,6 +2625,7 @@ Landroid/net/NetworkCapabilities;->setTransportInfo(Landroid/net/TransportInfo;)
 Landroid/net/NetworkCapabilities;->setTransportType(IZ)Landroid/net/NetworkCapabilities;,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->setTransportTypes([I)V,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->setUids(Ljava/util/Set;)Landroid/net/NetworkCapabilities;,lo-prio,max-target-o
+Landroid/net/NetworkCapabilities;->setUnderlyingNetworks(Ljava/util/List;)V,blocked
 Landroid/net/NetworkCapabilities;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NetworkCapabilities;->transportNameOf(I)Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,max-target-r
@@ -3513,14 +3523,22 @@ Landroid/net/TetheringManager$$ExternalSyntheticLambda0;-><init>(Landroid/net/IT
 Landroid/net/TetheringManager$$ExternalSyntheticLambda0;->f$0:Landroid/net/ITetheringEventCallback;,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda0;->f$1:Ljava/lang/String;,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda0;->onConnectorAvailable(Landroid/net/ITetheringConnector;)V,blocked
-Landroid/net/TetheringManager$$ExternalSyntheticLambda10;-><init>(Landroid/net/TetheringManager;ZLjava/lang/String;)V,blocked
+Landroid/net/TetheringManager$$ExternalSyntheticLambda10;-><init>(Landroid/net/TetheringManager;Ljava/lang/String;Ljava/lang/String;)V,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda10;->f$0:Landroid/net/TetheringManager;,blocked
-Landroid/net/TetheringManager$$ExternalSyntheticLambda10;->f$1:Z,blocked
+Landroid/net/TetheringManager$$ExternalSyntheticLambda10;->f$1:Ljava/lang/String;,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda10;->f$2:Ljava/lang/String;,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda10;->runRequest(Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
-Landroid/net/TetheringManager$$ExternalSyntheticLambda11;-><init>(Landroid/net/TetheringManager;)V,blocked
+Landroid/net/TetheringManager$$ExternalSyntheticLambda11;-><init>(Landroid/net/TetheringManager;ZLjava/lang/String;)V,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda11;->f$0:Landroid/net/TetheringManager;,blocked
-Landroid/net/TetheringManager$$ExternalSyntheticLambda11;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/TetheringManager$$ExternalSyntheticLambda11;->f$1:Z,blocked
+Landroid/net/TetheringManager$$ExternalSyntheticLambda11;->f$2:Ljava/lang/String;,blocked
+Landroid/net/TetheringManager$$ExternalSyntheticLambda11;->runRequest(Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
+Landroid/net/TetheringManager$$ExternalSyntheticLambda12;-><init>(Z)V,blocked
+Landroid/net/TetheringManager$$ExternalSyntheticLambda12;->f$0:Z,blocked
+Landroid/net/TetheringManager$$ExternalSyntheticLambda12;->runRequest(Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
+Landroid/net/TetheringManager$$ExternalSyntheticLambda13;-><init>(Landroid/net/TetheringManager;)V,blocked
+Landroid/net/TetheringManager$$ExternalSyntheticLambda13;->f$0:Landroid/net/TetheringManager;,blocked
+Landroid/net/TetheringManager$$ExternalSyntheticLambda13;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$$ExternalSyntheticLambda1;-><init>(Landroid/net/ITetheringEventCallback;Ljava/lang/String;)V,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda1;->f$0:Landroid/net/ITetheringEventCallback;,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda1;->f$1:Ljava/lang/String;,blocked
@@ -3554,11 +3572,10 @@ Landroid/net/TetheringManager$$ExternalSyntheticLambda6;->onConnectorAvailable(L
 Landroid/net/TetheringManager$$ExternalSyntheticLambda7;-><init>(Landroid/net/TetheringManager;Ljava/lang/String;)V,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda7;->f$0:Landroid/net/TetheringManager;,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda7;->f$1:Ljava/lang/String;,blocked
-Landroid/net/TetheringManager$$ExternalSyntheticLambda7;->runRequest(Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
-Landroid/net/TetheringManager$$ExternalSyntheticLambda8;-><init>(Landroid/net/TetheringManager;Ljava/lang/String;Ljava/lang/String;)V,blocked
+Landroid/net/TetheringManager$$ExternalSyntheticLambda7;->onConnectorAvailable(Landroid/net/ITetheringConnector;)V,blocked
+Landroid/net/TetheringManager$$ExternalSyntheticLambda8;-><init>(Landroid/net/TetheringManager;Ljava/lang/String;)V,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda8;->f$0:Landroid/net/TetheringManager;,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda8;->f$1:Ljava/lang/String;,blocked
-Landroid/net/TetheringManager$$ExternalSyntheticLambda8;->f$2:Ljava/lang/String;,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda8;->runRequest(Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda9;-><init>(Landroid/net/TetheringManager;Ljava/lang/String;Ljava/lang/String;)V,blocked
 Landroid/net/TetheringManager$$ExternalSyntheticLambda9;->f$0:Landroid/net/TetheringManager;,blocked
@@ -3588,9 +3605,8 @@ Landroid/net/TetheringManager$3;->onReceiveResult(ILandroid/os/Bundle;)V,public-
 Landroid/net/TetheringManager$3;->this$0:Landroid/net/TetheringManager;,blocked
 Landroid/net/TetheringManager$3;->val$executor:Ljava/util/concurrent/Executor;,blocked
 Landroid/net/TetheringManager$3;->val$listener:Landroid/net/TetheringManager$OnTetheringEntitlementResultListener;,blocked
-Landroid/net/TetheringManager$4$$ExternalSyntheticLambda0;-><init>(Landroid/net/TetheringManager$4;I)V,blocked
-Landroid/net/TetheringManager$4$$ExternalSyntheticLambda0;->f$0:Landroid/net/TetheringManager$4;,blocked
-Landroid/net/TetheringManager$4$$ExternalSyntheticLambda0;->f$1:I,blocked
+Landroid/net/TetheringManager$4$$ExternalSyntheticLambda0;-><init>(I)V,blocked
+Landroid/net/TetheringManager$4$$ExternalSyntheticLambda0;->f$0:I,blocked
 Landroid/net/TetheringManager$4$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$4$$ExternalSyntheticLambda1;-><init>(Landroid/net/TetheringManager$4;Landroid/net/TetherStatesParcel;)V,blocked
 Landroid/net/TetheringManager$4$$ExternalSyntheticLambda1;->f$0:Landroid/net/TetheringManager$4;,blocked
@@ -3619,7 +3635,7 @@ Landroid/net/TetheringManager$4$$ExternalSyntheticLambda6;->f$1:Ljava/util/List;
 Landroid/net/TetheringManager$4$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager$4;-><init>(Landroid/net/TetheringManager;Ljava/util/concurrent/Executor;Landroid/net/TetheringManager$TetheringEventCallback;)V,blocked
 Landroid/net/TetheringManager$4;->lambda$onCallbackStarted$1$TetheringManager$4(Landroid/net/TetheringManager$TetheringEventCallback;Landroid/net/TetheringCallbackStartedParcel;)V,blocked
-Landroid/net/TetheringManager$4;->lambda$onCallbackStopped$2$TetheringManager$4(I)V,blocked
+Landroid/net/TetheringManager$4;->lambda$onCallbackStopped$2(I)V,blocked
 Landroid/net/TetheringManager$4;->lambda$onConfigurationChanged$3$TetheringManager$4(Landroid/net/TetheringConfigurationParcel;)V,blocked
 Landroid/net/TetheringManager$4;->lambda$onOffloadStatusChanged$6(Landroid/net/TetheringManager$TetheringEventCallback;I)V,blocked
 Landroid/net/TetheringManager$4;->lambda$onTetherClientsChanged$5(Landroid/net/TetheringManager$TetheringEventCallback;Ljava/util/List;)V,blocked
@@ -3657,7 +3673,7 @@ Landroid/net/TetheringManager$RequestDispatcher$1;-><init>(Landroid/net/Tetherin
 Landroid/net/TetheringManager$RequestDispatcher$1;->onResult(I)V,blocked
 Landroid/net/TetheringManager$RequestDispatcher$1;->this$1:Landroid/net/TetheringManager$RequestDispatcher;,blocked
 Landroid/net/TetheringManager$RequestDispatcher;-><init>(Landroid/net/TetheringManager;)V,blocked
-Landroid/net/TetheringManager$RequestDispatcher;->access$100(Landroid/net/TetheringManager$RequestDispatcher;)Landroid/os/ConditionVariable;,blocked
+Landroid/net/TetheringManager$RequestDispatcher;->access$000(Landroid/net/TetheringManager$RequestDispatcher;)Landroid/os/ConditionVariable;,blocked
 Landroid/net/TetheringManager$RequestDispatcher;->lambda$waitForResult$0$TetheringManager$RequestDispatcher(Landroid/net/TetheringManager$RequestHelper;Landroid/net/ITetheringConnector;)V,blocked
 Landroid/net/TetheringManager$RequestDispatcher;->mListener:Landroid/net/IIntResultListener;,blocked
 Landroid/net/TetheringManager$RequestDispatcher;->mRemoteResult:I,blocked
@@ -3667,9 +3683,12 @@ Landroid/net/TetheringManager$RequestDispatcher;->waitForResult(Landroid/net/Tet
 Landroid/net/TetheringManager$RequestHelper;->runRequest(Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
 Landroid/net/TetheringManager$StartTetheringCallback;->onTetheringFailed(I)V,sdk,system-api,test-api
 Landroid/net/TetheringManager$StartTetheringCallback;->onTetheringStarted()V,sdk,system-api,test-api
+Landroid/net/TetheringManager$TetheredInterfaceCallback;->onAvailable(Ljava/lang/String;)V,blocked
+Landroid/net/TetheringManager$TetheredInterfaceCallback;->onUnavailable()V,blocked
+Landroid/net/TetheringManager$TetheredInterfaceRequest;->release()V,blocked
 Landroid/net/TetheringManager$TetheringCallbackInternal;-><init>(Landroid/net/TetheringManager;)V,blocked
-Landroid/net/TetheringManager$TetheringCallbackInternal;-><init>(Landroid/net/TetheringManager;Landroid/net/TetheringManager$1;)V,blocked
 Landroid/net/TetheringManager$TetheringCallbackInternal;->mError:I,blocked
+Landroid/net/TetheringManager$TetheringCallbackInternal;->mTetheringMgrRef:Ljava/lang/ref/WeakReference;,blocked
 Landroid/net/TetheringManager$TetheringCallbackInternal;->mWaitForCallback:Landroid/os/ConditionVariable;,blocked
 Landroid/net/TetheringManager$TetheringCallbackInternal;->onCallbackStarted(Landroid/net/TetheringCallbackStartedParcel;)V,blocked
 Landroid/net/TetheringManager$TetheringCallbackInternal;->onCallbackStopped(I)V,blocked
@@ -3678,7 +3697,6 @@ Landroid/net/TetheringManager$TetheringCallbackInternal;->onOffloadStatusChanged
 Landroid/net/TetheringManager$TetheringCallbackInternal;->onTetherClientsChanged(Ljava/util/List;)V,blocked
 Landroid/net/TetheringManager$TetheringCallbackInternal;->onTetherStatesChanged(Landroid/net/TetherStatesParcel;)V,blocked
 Landroid/net/TetheringManager$TetheringCallbackInternal;->onUpstreamChanged(Landroid/net/Network;)V,blocked
-Landroid/net/TetheringManager$TetheringCallbackInternal;->this$0:Landroid/net/TetheringManager;,blocked
 Landroid/net/TetheringManager$TetheringCallbackInternal;->waitForStarted()V,blocked
 Landroid/net/TetheringManager$TetheringEventCallback;->onClientsChanged(Ljava/util/Collection;)V,sdk,system-api,test-api
 Landroid/net/TetheringManager$TetheringEventCallback;->onError(Landroid/net/TetheringInterface;I)V,sdk,system-api,test-api
@@ -3711,7 +3729,7 @@ Landroid/net/TetheringManager$TetheringRequest$Builder;->setShouldShowEntitlemen
 Landroid/net/TetheringManager$TetheringRequest$Builder;->setStaticIpv4Addresses(Landroid/net/LinkAddress;Landroid/net/LinkAddress;)Landroid/net/TetheringManager$TetheringRequest$Builder;,sdk,system-api,test-api
 Landroid/net/TetheringManager$TetheringRequest;-><init>(Landroid/net/TetheringRequestParcel;)V,blocked
 Landroid/net/TetheringManager$TetheringRequest;-><init>(Landroid/net/TetheringRequestParcel;Landroid/net/TetheringManager$1;)V,blocked
-Landroid/net/TetheringManager$TetheringRequest;->access$600(II)Z,blocked
+Landroid/net/TetheringManager$TetheringRequest;->access$500(II)Z,blocked
 Landroid/net/TetheringManager$TetheringRequest;->checkConnectivityScope(II)Z,blocked
 Landroid/net/TetheringManager$TetheringRequest;->checkStaticAddressConfiguration(Landroid/net/LinkAddress;Landroid/net/LinkAddress;)Z,blocked
 Landroid/net/TetheringManager$TetheringRequest;->getClientStaticIpv4Address()Landroid/net/LinkAddress;,sdk,system-api,test-api
@@ -3764,10 +3782,11 @@ Landroid/net/TetheringManager;->TETHER_ERROR_UNTETHER_IFACE_ERROR:I,sdk,system-a
 Landroid/net/TetheringManager;->TETHER_HARDWARE_OFFLOAD_FAILED:I,sdk,system-api,test-api
 Landroid/net/TetheringManager;->TETHER_HARDWARE_OFFLOAD_STARTED:I,sdk,system-api,test-api
 Landroid/net/TetheringManager;->TETHER_HARDWARE_OFFLOAD_STOPPED:I,sdk,system-api,test-api
-Landroid/net/TetheringManager;->access$200(Landroid/net/TetheringManager;Landroid/net/TetheringManager$ConnectorConsumer;)V,blocked
-Landroid/net/TetheringManager;->access$300(Landroid/net/TetheringManager;I)V,blocked
-Landroid/net/TetheringManager;->access$402(Landroid/net/TetheringManager;Landroid/net/TetheringConfigurationParcel;)Landroid/net/TetheringConfigurationParcel;,blocked
-Landroid/net/TetheringManager;->access$502(Landroid/net/TetheringManager;Landroid/net/TetherStatesParcel;)Landroid/net/TetherStatesParcel;,blocked
+Landroid/net/TetheringManager;->access$100(Landroid/net/TetheringManager;Landroid/net/TetheringManager$ConnectorConsumer;)V,blocked
+Landroid/net/TetheringManager;->access$200(I)V,blocked
+Landroid/net/TetheringManager;->access$302(Landroid/net/TetheringManager;Landroid/net/TetheringConfigurationParcel;)Landroid/net/TetheringConfigurationParcel;,blocked
+Landroid/net/TetheringManager;->access$402(Landroid/net/TetheringManager;Landroid/net/TetherStatesParcel;)Landroid/net/TetherStatesParcel;,blocked
+Landroid/net/TetheringManager;->finalize()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TetheringManager;->getAttributionTag()Ljava/lang/String;,blocked
 Landroid/net/TetheringManager;->getConnector(Landroid/net/TetheringManager$ConnectorConsumer;)V,blocked
 Landroid/net/TetheringManager;->getLastTetherError(Ljava/lang/String;)I,blocked
@@ -3780,18 +3799,20 @@ Landroid/net/TetheringManager;->getTetheredIfaces()[Ljava/lang/String;,blocked
 Landroid/net/TetheringManager;->getTetheringErroredIfaces()[Ljava/lang/String;,blocked
 Landroid/net/TetheringManager;->isTetheringSupported()Z,blocked
 Landroid/net/TetheringManager;->isTetheringSupported(Ljava/lang/String;)Z,blocked
-Landroid/net/TetheringManager;->lambda$isTetheringSupported$10$TetheringManager(Ljava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
+Landroid/net/TetheringManager;->lambda$finalize$1$TetheringManager(Ljava/lang/String;Landroid/net/ITetheringConnector;)V,blocked
+Landroid/net/TetheringManager;->lambda$isTetheringSupported$11$TetheringManager(Ljava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
 Landroid/net/TetheringManager;->lambda$new$0$TetheringManager(Ljava/lang/String;Landroid/net/ITetheringConnector;)V,blocked
-Landroid/net/TetheringManager;->lambda$registerTetheringEventCallback$8(Landroid/net/ITetheringEventCallback;Ljava/lang/String;Landroid/net/ITetheringConnector;)V,blocked
-Landroid/net/TetheringManager;->lambda$requestLatestTetheringEntitlementResult$7$TetheringManager(ILandroid/os/ResultReceiver;ZLjava/lang/String;Landroid/net/ITetheringConnector;)V,blocked
-Landroid/net/TetheringManager;->lambda$setUsbTethering$4$TetheringManager(ZLjava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
-Landroid/net/TetheringManager;->lambda$startPollingForConnector$1$TetheringManager()V,blocked
-Landroid/net/TetheringManager;->lambda$startTethering$5$TetheringManager(Landroid/net/TetheringManager$TetheringRequest;Ljava/lang/String;Landroid/net/IIntResultListener;Landroid/net/ITetheringConnector;)V,blocked
-Landroid/net/TetheringManager;->lambda$stopAllTethering$11$TetheringManager(Ljava/lang/String;Landroid/net/ITetheringConnector;)V,blocked
-Landroid/net/TetheringManager;->lambda$stopTethering$6$TetheringManager(ILjava/lang/String;Landroid/net/ITetheringConnector;)V,blocked
-Landroid/net/TetheringManager;->lambda$tether$2$TetheringManager(Ljava/lang/String;Ljava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
-Landroid/net/TetheringManager;->lambda$unregisterTetheringEventCallback$9(Landroid/net/ITetheringEventCallback;Ljava/lang/String;Landroid/net/ITetheringConnector;)V,blocked
-Landroid/net/TetheringManager;->lambda$untether$3$TetheringManager(Ljava/lang/String;Ljava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
+Landroid/net/TetheringManager;->lambda$registerTetheringEventCallback$9(Landroid/net/ITetheringEventCallback;Ljava/lang/String;Landroid/net/ITetheringConnector;)V,blocked
+Landroid/net/TetheringManager;->lambda$requestLatestTetheringEntitlementResult$8$TetheringManager(ILandroid/os/ResultReceiver;ZLjava/lang/String;Landroid/net/ITetheringConnector;)V,blocked
+Landroid/net/TetheringManager;->lambda$setPreferTestNetworks$13(ZLandroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
+Landroid/net/TetheringManager;->lambda$setUsbTethering$5$TetheringManager(ZLjava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
+Landroid/net/TetheringManager;->lambda$startPollingForConnector$2$TetheringManager()V,blocked
+Landroid/net/TetheringManager;->lambda$startTethering$6$TetheringManager(Landroid/net/TetheringManager$TetheringRequest;Ljava/lang/String;Landroid/net/IIntResultListener;Landroid/net/ITetheringConnector;)V,blocked
+Landroid/net/TetheringManager;->lambda$stopAllTethering$12$TetheringManager(Ljava/lang/String;Landroid/net/ITetheringConnector;)V,blocked
+Landroid/net/TetheringManager;->lambda$stopTethering$7$TetheringManager(ILjava/lang/String;Landroid/net/ITetheringConnector;)V,blocked
+Landroid/net/TetheringManager;->lambda$tether$3$TetheringManager(Ljava/lang/String;Ljava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
+Landroid/net/TetheringManager;->lambda$unregisterTetheringEventCallback$10(Landroid/net/ITetheringEventCallback;Ljava/lang/String;Landroid/net/ITetheringConnector;)V,blocked
+Landroid/net/TetheringManager;->lambda$untether$4$TetheringManager(Ljava/lang/String;Ljava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V,blocked
 Landroid/net/TetheringManager;->mCallback:Landroid/net/TetheringManager$TetheringCallbackInternal;,blocked
 Landroid/net/TetheringManager;->mConnector:Landroid/net/ITetheringConnector;,blocked
 Landroid/net/TetheringManager;->mConnectorSupplier:Ljava/util/function/Supplier;,blocked
@@ -3804,6 +3825,7 @@ Landroid/net/TetheringManager;->onTetheringConnected(Landroid/net/ITetheringConn
 Landroid/net/TetheringManager;->registerTetheringEventCallback(Ljava/util/concurrent/Executor;Landroid/net/TetheringManager$TetheringEventCallback;)V,sdk,system-api,test-api
 Landroid/net/TetheringManager;->requestLatestTetheringEntitlementResult(ILandroid/os/ResultReceiver;Z)V,blocked
 Landroid/net/TetheringManager;->requestLatestTetheringEntitlementResult(IZLjava/util/concurrent/Executor;Landroid/net/TetheringManager$OnTetheringEntitlementResultListener;)V,sdk,system-api,test-api
+Landroid/net/TetheringManager;->setPreferTestNetworks(Z)V,blocked
 Landroid/net/TetheringManager;->setUsbTethering(Z)I,blocked
 Landroid/net/TetheringManager;->startPollingForConnector()V,blocked
 Landroid/net/TetheringManager;->startTethering(ILjava/util/concurrent/Executor;Landroid/net/TetheringManager$StartTetheringCallback;)V,blocked
@@ -3902,6 +3924,25 @@ Landroid/net/apf/ApfCapabilities;->maximumApfProgramSize:I,sdk,system-api,test-a
 Landroid/net/apf/ApfCapabilities;->sResources:Landroid/net/ConnectivityResources;,blocked
 Landroid/net/apf/ApfCapabilities;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/apf/ApfCapabilities;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/framework/modules/utils/build/SdkLevel;-><init>()V,blocked
+Landroid/net/connectivity/framework/modules/utils/build/SdkLevel;->isAtLeastPreReleaseCodename(Ljava/lang/String;)Z,blocked
+Landroid/net/connectivity/framework/modules/utils/build/SdkLevel;->isAtLeastR()Z,blocked
+Landroid/net/connectivity/framework/modules/utils/build/SdkLevel;->isAtLeastS()Z,blocked
+Landroid/net/connectivity/framework/modules/utils/build/SdkLevel;->isAtLeastT()Z,blocked
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;-><clinit>()V,blocked
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;-><init>(ILjava/lang/String;)V,blocked
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->isAtLeast(Ljava/lang/String;)Z,blocked
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->isAtLeastInternal(Ljava/lang/String;)Z,blocked
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->isAtMost(Ljava/lang/String;)Z,blocked
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->isAtMostInternal(Ljava/lang/String;)Z,blocked
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->isCodename(Ljava/lang/String;)Z,blocked
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->mCodename:Ljava/lang/String;,blocked
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->mIsReleaseBuild:Z,blocked
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->mSdkInt:I,blocked
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->sInstance:Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;,blocked
+Landroid/net/connectivity/framework/util/BinderUtils$ThrowingRunnable;->run()V,blocked
+Landroid/net/connectivity/framework/util/BinderUtils;-><init>()V,blocked
+Landroid/net/connectivity/framework/util/BinderUtils;->withCleanCallingIdentity(Landroid/net/connectivity/framework/util/BinderUtils$ThrowingRunnable;)V,blocked
 Landroid/net/connectivity/framework/util/CollectionUtils;-><init>()V,blocked
 Landroid/net/connectivity/framework/util/CollectionUtils;->all(Ljava/util/Collection;Ljava/util/function/Predicate;)Z,blocked
 Landroid/net/connectivity/framework/util/CollectionUtils;->any(Landroid/util/SparseArray;Ljava/util/function/Predicate;)Z,blocked
@@ -4021,6 +4062,19 @@ Landroid/net/connectivity/framework/util/InetAddressUtils;-><init>()V,blocked
 Landroid/net/connectivity/framework/util/InetAddressUtils;->INET6_ADDR_LENGTH:I,blocked
 Landroid/net/connectivity/framework/util/InetAddressUtils;->parcelInetAddress(Landroid/os/Parcel;Ljava/net/InetAddress;I)V,blocked
 Landroid/net/connectivity/framework/util/InetAddressUtils;->unparcelInetAddress(Landroid/os/Parcel;)Ljava/net/InetAddress;,blocked
+Landroid/net/connectivity/framework/util/InterfaceParams;-><init>(Ljava/lang/String;ILandroid/net/MacAddress;)V,blocked
+Landroid/net/connectivity/framework/util/InterfaceParams;-><init>(Ljava/lang/String;ILandroid/net/MacAddress;I)V,blocked
+Landroid/net/connectivity/framework/util/InterfaceParams;->ETHER_MTU:I,blocked
+Landroid/net/connectivity/framework/util/InterfaceParams;->IPV6_MIN_MTU:I,blocked
+Landroid/net/connectivity/framework/util/InterfaceParams;->defaultMtu:I,blocked
+Landroid/net/connectivity/framework/util/InterfaceParams;->getByName(Ljava/lang/String;)Landroid/net/connectivity/framework/util/InterfaceParams;,blocked
+Landroid/net/connectivity/framework/util/InterfaceParams;->getMacAddress(Ljava/net/NetworkInterface;)Landroid/net/MacAddress;,blocked
+Landroid/net/connectivity/framework/util/InterfaceParams;->getNetworkInterfaceByName(Ljava/lang/String;)Ljava/net/NetworkInterface;,blocked
+Landroid/net/connectivity/framework/util/InterfaceParams;->hasMacAddress:Z,blocked
+Landroid/net/connectivity/framework/util/InterfaceParams;->index:I,blocked
+Landroid/net/connectivity/framework/util/InterfaceParams;->macAddr:Landroid/net/MacAddress;,blocked
+Landroid/net/connectivity/framework/util/InterfaceParams;->name:Ljava/lang/String;,blocked
+Landroid/net/connectivity/framework/util/InterfaceParams;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/framework/util/IpRange;-><init>(Landroid/net/IpPrefix;)V,blocked
 Landroid/net/connectivity/framework/util/IpRange;-><init>(Ljava/net/InetAddress;Ljava/net/InetAddress;)V,blocked
 Landroid/net/connectivity/framework/util/IpRange;->SIGNUM_POSITIVE:I,blocked
@@ -4090,7 +4144,7 @@ Landroid/net/connectivity/framework/util/LocationPermissionChecker;->mContext:La
 Landroid/net/connectivity/framework/util/LocationPermissionChecker;->noteAppOpAllowed(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Z,blocked
 Landroid/net/connectivity/framework/util/MacAddressUtils;-><clinit>()V,blocked
 Landroid/net/connectivity/framework/util/MacAddressUtils;-><init>()V,blocked
-Landroid/net/connectivity/framework/util/MacAddressUtils;->DEFAULT_MAC_ADDRESS:Ljava/lang/String;,blocked
+Landroid/net/connectivity/framework/util/MacAddressUtils;->DEFAULT_MAC_ADDRESS:Landroid/net/MacAddress;,blocked
 Landroid/net/connectivity/framework/util/MacAddressUtils;->ETHER_ADDR_LEN:I,blocked
 Landroid/net/connectivity/framework/util/MacAddressUtils;->LOCALLY_ASSIGNED_MASK:J,blocked
 Landroid/net/connectivity/framework/util/MacAddressUtils;->MULTICAST_MASK:J,blocked
@@ -4233,6 +4287,7 @@ Landroid/net/connectivity/framework/util/ProxyUtils;->PROXY_VALID:I,blocked
 Landroid/net/connectivity/framework/util/ProxyUtils;->exclusionListAsString([Ljava/lang/String;)Ljava/lang/String;,blocked
 Landroid/net/connectivity/framework/util/ProxyUtils;->exclusionStringAsList(Ljava/lang/String;)Ljava/util/List;,blocked
 Landroid/net/connectivity/framework/util/ProxyUtils;->validate(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I,blocked
+Landroid/net/connectivity/framework/util/RouteUtils;-><init>()V,blocked
 Landroid/net/util/DnsUtils$Rfc6724Comparator;-><init>()V,blocked
 Landroid/net/util/DnsUtils$Rfc6724Comparator;->compare(Landroid/net/util/DnsUtils$SortableAddress;Landroid/net/util/DnsUtils$SortableAddress;)I,blocked
 Landroid/net/util/DnsUtils$Rfc6724Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 0f3ae5e..4bee3ec 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -1,49 +1,49 @@
 signature,file,startline,startcol,endline,endcol,properties
-Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1980,9,1980,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1906,9,1906,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1910,9,1910,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1913,9,1913,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1916,9,1916,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->INET_CONDITION_ACTION:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,351,5,351,25,
-Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,366,5,366,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,375,5,375,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,390,5,390,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->EXTRA_ERRORED_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,399,5,399,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_FOTA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,663,5,663,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_IMS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,672,5,672,25,
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_CBS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,681,5,681,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_IA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,700,5,700,25,
-Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,710,5,710,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,926,5,926,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->getNetworkTypeName(I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,973,5,973,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1040,5,1040,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1309,5,1309,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1431,5,1431,25,
-Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1469,5,1469,25,
-Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1493,5,1493,88,maxTargetSdk=28&trackingBug=109783091L
-Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1518,5,1518,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1692,5,1692,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1778,5,1778,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1807,5,1807,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1837,5,1837,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->startNattKeepalive(Landroid/net/Network;ILandroid/net/ConnectivityManager$PacketKeepaliveCallback;Ljava/net/InetAddress;ILjava/net/InetAddress;)Landroid/net/ConnectivityManager$PacketKeepalive;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2061,5,2061,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2242,5,2242,25,
-Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2296,5,2296,25,
-Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2306,5,2306,25,
-Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2412,5,2412,25,
-Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2457,5,2457,25,
-Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2475,5,2475,25,
-Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2490,5,2490,25,
-Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2511,5,2511,25,
-Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2555,5,2555,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2579,5,2579,25,
-Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2817,5,2817,25,
-Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2835,5,2835,25,
-Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2854,5,2854,25,
-Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2878,5,2878,25,
-Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2994,5,2994,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3244,5,3244,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5025,5,5025,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1985,9,1985,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1911,9,1911,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1915,9,1915,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1918,9,1918,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1921,9,1921,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->INET_CONDITION_ACTION:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,355,5,355,25,
+Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,370,5,370,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,379,5,379,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,394,5,394,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->EXTRA_ERRORED_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,403,5,403,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_FOTA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,667,5,667,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_IMS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,676,5,676,25,
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_CBS:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,685,5,685,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_IA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,704,5,704,25,
+Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,714,5,714,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,930,5,930,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->getNetworkTypeName(I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,977,5,977,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1044,5,1044,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1314,5,1314,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1436,5,1436,25,
+Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1474,5,1474,25,
+Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1498,5,1498,88,maxTargetSdk=28&trackingBug=109783091L
+Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1523,5,1523,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1697,5,1697,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1783,5,1783,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1812,5,1812,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1842,5,1842,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->startNattKeepalive(Landroid/net/Network;ILandroid/net/ConnectivityManager$PacketKeepaliveCallback;Ljava/net/InetAddress;ILjava/net/InetAddress;)Landroid/net/ConnectivityManager$PacketKeepalive;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2066,5,2066,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2247,5,2247,25,
+Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2301,5,2301,25,
+Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2311,5,2311,25,
+Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2423,5,2423,25,
+Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2468,5,2468,25,
+Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2486,5,2486,25,
+Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2501,5,2501,25,
+Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2522,5,2522,25,
+Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2566,5,2566,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2590,5,2590,25,
+Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2828,5,2828,25,
+Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2846,5,2846,25,
+Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2865,5,2865,25,
+Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2889,5,2889,25,
+Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3005,5,3005,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3255,5,3255,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5037,5,5037,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/IConnectivityManager;->getActiveNetworkInfo()Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/IConnectivityManager.aidl,59,1,59,25,
 Landroid/net/IConnectivityManager;->getNetworkInfo(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/IConnectivityManager.aidl,62,1,62,44,maxTargetSdk=28
 Landroid/net/IConnectivityManager;->getAllNetworkInfo()[Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/IConnectivityManager.aidl,65,1,65,25,
@@ -84,15 +84,15 @@ 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,946,5,946,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/NetworkCapabilities;->mNetworkCapabilities:J,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,222,5,222,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1452,5,1452,63,maxTargetSdk=28
-Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1478,5,1478,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2161,5,2161,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkInfo;-><init>(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,181,5,181,25,
-Landroid/net/NetworkInfo;->setSubtype(ILjava/lang/String;)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,250,5,250,25,
-Landroid/net/NetworkInfo;->setIsAvailable(Z)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,369,5,369,25,
-Landroid/net/NetworkInfo;->setFailover(Z)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,400,5,400,25,
-Landroid/net/NetworkInfo;->setRoaming(Z)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,431,5,431,25,
+Landroid/net/NetworkCapabilities;->mNetworkCapabilities:J,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,233,5,233,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1506,5,1506,63,maxTargetSdk=28
+Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1532,5,1532,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2232,5,2232,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,372,5,372,25,
+Landroid/net/NetworkInfo;->setFailover(Z)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,403,5,403,25,
+Landroid/net/NetworkInfo;->setRoaming(Z)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,434,5,434,25,
 Landroid/net/NetworkRequest;->networkCapabilities:Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/NetworkRequest.java,78,5,78,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkRequest;->requestId:I,packages/modules/Connectivity/framework/src/android/net/NetworkRequest.java,87,5,87,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkRequest;->legacyType:I,packages/modules/Connectivity/framework/src/android/net/NetworkRequest.java,95,5,95,88,maxTargetSdk=28&trackingBug=115609023L
diff --git a/current/hiddenapi/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index e066f5e..1ac3e39 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv
@@ -1598,6 +1598,7 @@ Landroid/net/ITetheringConnector$Default;->asBinder()Landroid/os/IBinder;,public
 Landroid/net/ITetheringConnector$Default;->isTetheringSupported(Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V
 Landroid/net/ITetheringConnector$Default;->registerTetheringEventCallback(Landroid/net/ITetheringEventCallback;Ljava/lang/String;)V
 Landroid/net/ITetheringConnector$Default;->requestLatestTetheringEntitlementResult(ILandroid/os/ResultReceiver;ZLjava/lang/String;Ljava/lang/String;)V
+Landroid/net/ITetheringConnector$Default;->setPreferTestNetworks(ZLandroid/net/IIntResultListener;)V
 Landroid/net/ITetheringConnector$Default;->setUsbTethering(ZLjava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V
 Landroid/net/ITetheringConnector$Default;->startTethering(Landroid/net/TetheringRequestParcel;Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V
 Landroid/net/ITetheringConnector$Default;->stopAllTethering(Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V
@@ -1613,6 +1614,7 @@ Landroid/net/ITetheringConnector$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/ITetheringConnector$Stub$Proxy;->registerTetheringEventCallback(Landroid/net/ITetheringEventCallback;Ljava/lang/String;)V
 Landroid/net/ITetheringConnector$Stub$Proxy;->requestLatestTetheringEntitlementResult(ILandroid/os/ResultReceiver;ZLjava/lang/String;Ljava/lang/String;)V
 Landroid/net/ITetheringConnector$Stub$Proxy;->sDefaultImpl:Landroid/net/ITetheringConnector;
+Landroid/net/ITetheringConnector$Stub$Proxy;->setPreferTestNetworks(ZLandroid/net/IIntResultListener;)V
 Landroid/net/ITetheringConnector$Stub$Proxy;->setUsbTethering(ZLjava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V
 Landroid/net/ITetheringConnector$Stub$Proxy;->startTethering(Landroid/net/TetheringRequestParcel;Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V
 Landroid/net/ITetheringConnector$Stub$Proxy;->stopAllTethering(Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V
@@ -1624,6 +1626,7 @@ Landroid/net/ITetheringConnector$Stub;-><init>()V
 Landroid/net/ITetheringConnector$Stub;->TRANSACTION_isTetheringSupported:I
 Landroid/net/ITetheringConnector$Stub;->TRANSACTION_registerTetheringEventCallback:I
 Landroid/net/ITetheringConnector$Stub;->TRANSACTION_requestLatestTetheringEntitlementResult:I
+Landroid/net/ITetheringConnector$Stub;->TRANSACTION_setPreferTestNetworks:I
 Landroid/net/ITetheringConnector$Stub;->TRANSACTION_setUsbTethering:I
 Landroid/net/ITetheringConnector$Stub;->TRANSACTION_startTethering:I
 Landroid/net/ITetheringConnector$Stub;->TRANSACTION_stopAllTethering:I
@@ -1640,6 +1643,7 @@ Landroid/net/ITetheringConnector;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/ITetheringConnector;->isTetheringSupported(Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V
 Landroid/net/ITetheringConnector;->registerTetheringEventCallback(Landroid/net/ITetheringEventCallback;Ljava/lang/String;)V
 Landroid/net/ITetheringConnector;->requestLatestTetheringEntitlementResult(ILandroid/os/ResultReceiver;ZLjava/lang/String;Ljava/lang/String;)V
+Landroid/net/ITetheringConnector;->setPreferTestNetworks(ZLandroid/net/IIntResultListener;)V
 Landroid/net/ITetheringConnector;->setUsbTethering(ZLjava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V
 Landroid/net/ITetheringConnector;->startTethering(Landroid/net/TetheringRequestParcel;Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V
 Landroid/net/ITetheringConnector;->stopAllTethering(Ljava/lang/String;Ljava/lang/String;Landroid/net/IIntResultListener;)V
@@ -2401,6 +2405,7 @@ Landroid/net/NetworkCapabilities$Builder;->setSsid(Ljava/lang/String;)Landroid/n
 Landroid/net/NetworkCapabilities$Builder;->setSubscriptionIds(Ljava/util/Set;)Landroid/net/NetworkCapabilities$Builder;,system-api,test-api
 Landroid/net/NetworkCapabilities$Builder;->setTransportInfo(Landroid/net/TransportInfo;)Landroid/net/NetworkCapabilities$Builder;,system-api,test-api
 Landroid/net/NetworkCapabilities$Builder;->setUids(Ljava/util/Set;)Landroid/net/NetworkCapabilities$Builder;
+Landroid/net/NetworkCapabilities$Builder;->setUnderlyingNetworks(Ljava/util/List;)Landroid/net/NetworkCapabilities$Builder;,system-api,test-api
 Landroid/net/NetworkCapabilities$Builder;->withoutDefaultCapabilities()Landroid/net/NetworkCapabilities$Builder;,system-api,test-api
 Landroid/net/NetworkCapabilities$NameOf;->nameOf(I)Ljava/lang/String;
 Landroid/net/NetworkCapabilities;-><clinit>()V
@@ -2529,6 +2534,7 @@ Landroid/net/NetworkCapabilities;->equalsSubscriptionIds(Landroid/net/NetworkCap
 Landroid/net/NetworkCapabilities;->equalsTransportInfo(Landroid/net/NetworkCapabilities;)Z
 Landroid/net/NetworkCapabilities;->equalsTransportTypes(Landroid/net/NetworkCapabilities;)Z
 Landroid/net/NetworkCapabilities;->equalsUids(Landroid/net/NetworkCapabilities;)Z
+Landroid/net/NetworkCapabilities;->equalsUnderlyingNetworks(Landroid/net/NetworkCapabilities;)Z
 Landroid/net/NetworkCapabilities;->getAdministratorUids()[I,system-api,test-api
 Landroid/net/NetworkCapabilities;->getApplicableRedactions()J
 Landroid/net/NetworkCapabilities;->getCapabilities()[I,public-api,system-api,test-api
@@ -2547,11 +2553,13 @@ Landroid/net/NetworkCapabilities;->getTransportInfo()Landroid/net/TransportInfo;
 Landroid/net/NetworkCapabilities;->getTransportTypes()[I,system-api,test-api
 Landroid/net/NetworkCapabilities;->getUidRanges()Ljava/util/Set;
 Landroid/net/NetworkCapabilities;->getUids()Ljava/util/Set;
+Landroid/net/NetworkCapabilities;->getUnderlyingNetworks()Ljava/util/List;,system-api,test-api
 Landroid/net/NetworkCapabilities;->hasCapability(I)Z,public-api,system-api,test-api
 Landroid/net/NetworkCapabilities;->hasConnectivityManagedCapability()Z
 Landroid/net/NetworkCapabilities;->hasForbiddenCapability(I)Z
 Landroid/net/NetworkCapabilities;->hasSameUids(Landroid/net/NetworkCapabilities;Landroid/net/NetworkCapabilities;)Z
 Landroid/net/NetworkCapabilities;->hasSignalStrength()Z
+Landroid/net/NetworkCapabilities;->hasSingleTransport(I)Z
 Landroid/net/NetworkCapabilities;->hasTransport(I)Z,public-api,system-api,test-api
 Landroid/net/NetworkCapabilities;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkCapabilities;->isMetered()Z
@@ -2574,6 +2582,7 @@ Landroid/net/NetworkCapabilities;->mSubIds:Landroid/util/ArraySet;
 Landroid/net/NetworkCapabilities;->mTransportInfo:Landroid/net/TransportInfo;
 Landroid/net/NetworkCapabilities;->mTransportTypes:J
 Landroid/net/NetworkCapabilities;->mUids:Landroid/util/ArraySet;
+Landroid/net/NetworkCapabilities;->mUnderlyingNetworks:Ljava/util/List;
 Landroid/net/NetworkCapabilities;->maxBandwidth(II)I
 Landroid/net/NetworkCapabilities;->maybeMarkCapabilitiesRestricted()V
 Landroid/net/NetworkCapabilities;->minBandwidth(II)I
@@ -2616,6 +2625,7 @@ Landroid/net/NetworkCapabilities;->setTransportInfo(Landroid/net/TransportInfo;)
 Landroid/net/NetworkCapabilities;->setTransportType(IZ)Landroid/net/NetworkCapabilities;
 Landroid/net/NetworkCapabilities;->setTransportTypes([I)V
 Landroid/net/NetworkCapabilities;->setUids(Ljava/util/Set;)Landroid/net/NetworkCapabilities;
+Landroid/net/NetworkCapabilities;->setUnderlyingNetworks(Ljava/util/List;)V
 Landroid/net/NetworkCapabilities;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/NetworkCapabilities;->transportNameOf(I)Ljava/lang/String;
 Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;
@@ -3513,14 +3523,22 @@ Landroid/net/TetheringManager$$ExternalSyntheticLambda0;-><init>(Landroid/net/IT
 Landroid/net/TetheringManager$$ExternalSyntheticLambda0;->f$0:Landroid/net/ITetheringEventCallback;
 Landroid/net/TetheringManager$$ExternalSyntheticLambda0;->f$1:Ljava/lang/String;
 Landroid/net/TetheringManager$$ExternalSyntheticLambda0;->onConnectorAvailable(Landroid/net/ITetheringConnector;)V
-Landroid/net/TetheringManager$$ExternalSyntheticLambda10;-><init>(Landroid/net/TetheringManager;ZLjava/lang/String;)V
+Landroid/net/TetheringManager$$ExternalSyntheticLambda10;-><init>(Landroid/net/TetheringManager;Ljava/lang/String;Ljava/lang/String;)V
 Landroid/net/TetheringManager$$ExternalSyntheticLambda10;->f$0:Landroid/net/TetheringManager;
-Landroid/net/TetheringManager$$ExternalSyntheticLambda10;->f$1:Z
+Landroid/net/TetheringManager$$ExternalSyntheticLambda10;->f$1:Ljava/lang/String;
 Landroid/net/TetheringManager$$ExternalSyntheticLambda10;->f$2:Ljava/lang/String;
 Landroid/net/TetheringManager$$ExternalSyntheticLambda10;->runRequest(Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
-Landroid/net/TetheringManager$$ExternalSyntheticLambda11;-><init>(Landroid/net/TetheringManager;)V
+Landroid/net/TetheringManager$$ExternalSyntheticLambda11;-><init>(Landroid/net/TetheringManager;ZLjava/lang/String;)V
 Landroid/net/TetheringManager$$ExternalSyntheticLambda11;->f$0:Landroid/net/TetheringManager;
-Landroid/net/TetheringManager$$ExternalSyntheticLambda11;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/TetheringManager$$ExternalSyntheticLambda11;->f$1:Z
+Landroid/net/TetheringManager$$ExternalSyntheticLambda11;->f$2:Ljava/lang/String;
+Landroid/net/TetheringManager$$ExternalSyntheticLambda11;->runRequest(Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
+Landroid/net/TetheringManager$$ExternalSyntheticLambda12;-><init>(Z)V
+Landroid/net/TetheringManager$$ExternalSyntheticLambda12;->f$0:Z
+Landroid/net/TetheringManager$$ExternalSyntheticLambda12;->runRequest(Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
+Landroid/net/TetheringManager$$ExternalSyntheticLambda13;-><init>(Landroid/net/TetheringManager;)V
+Landroid/net/TetheringManager$$ExternalSyntheticLambda13;->f$0:Landroid/net/TetheringManager;
+Landroid/net/TetheringManager$$ExternalSyntheticLambda13;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$$ExternalSyntheticLambda1;-><init>(Landroid/net/ITetheringEventCallback;Ljava/lang/String;)V
 Landroid/net/TetheringManager$$ExternalSyntheticLambda1;->f$0:Landroid/net/ITetheringEventCallback;
 Landroid/net/TetheringManager$$ExternalSyntheticLambda1;->f$1:Ljava/lang/String;
@@ -3554,11 +3572,10 @@ Landroid/net/TetheringManager$$ExternalSyntheticLambda6;->onConnectorAvailable(L
 Landroid/net/TetheringManager$$ExternalSyntheticLambda7;-><init>(Landroid/net/TetheringManager;Ljava/lang/String;)V
 Landroid/net/TetheringManager$$ExternalSyntheticLambda7;->f$0:Landroid/net/TetheringManager;
 Landroid/net/TetheringManager$$ExternalSyntheticLambda7;->f$1:Ljava/lang/String;
-Landroid/net/TetheringManager$$ExternalSyntheticLambda7;->runRequest(Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
-Landroid/net/TetheringManager$$ExternalSyntheticLambda8;-><init>(Landroid/net/TetheringManager;Ljava/lang/String;Ljava/lang/String;)V
+Landroid/net/TetheringManager$$ExternalSyntheticLambda7;->onConnectorAvailable(Landroid/net/ITetheringConnector;)V
+Landroid/net/TetheringManager$$ExternalSyntheticLambda8;-><init>(Landroid/net/TetheringManager;Ljava/lang/String;)V
 Landroid/net/TetheringManager$$ExternalSyntheticLambda8;->f$0:Landroid/net/TetheringManager;
 Landroid/net/TetheringManager$$ExternalSyntheticLambda8;->f$1:Ljava/lang/String;
-Landroid/net/TetheringManager$$ExternalSyntheticLambda8;->f$2:Ljava/lang/String;
 Landroid/net/TetheringManager$$ExternalSyntheticLambda8;->runRequest(Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
 Landroid/net/TetheringManager$$ExternalSyntheticLambda9;-><init>(Landroid/net/TetheringManager;Ljava/lang/String;Ljava/lang/String;)V
 Landroid/net/TetheringManager$$ExternalSyntheticLambda9;->f$0:Landroid/net/TetheringManager;
@@ -3588,9 +3605,8 @@ Landroid/net/TetheringManager$3;->onReceiveResult(ILandroid/os/Bundle;)V,public-
 Landroid/net/TetheringManager$3;->this$0:Landroid/net/TetheringManager;
 Landroid/net/TetheringManager$3;->val$executor:Ljava/util/concurrent/Executor;
 Landroid/net/TetheringManager$3;->val$listener:Landroid/net/TetheringManager$OnTetheringEntitlementResultListener;
-Landroid/net/TetheringManager$4$$ExternalSyntheticLambda0;-><init>(Landroid/net/TetheringManager$4;I)V
-Landroid/net/TetheringManager$4$$ExternalSyntheticLambda0;->f$0:Landroid/net/TetheringManager$4;
-Landroid/net/TetheringManager$4$$ExternalSyntheticLambda0;->f$1:I
+Landroid/net/TetheringManager$4$$ExternalSyntheticLambda0;-><init>(I)V
+Landroid/net/TetheringManager$4$$ExternalSyntheticLambda0;->f$0:I
 Landroid/net/TetheringManager$4$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$4$$ExternalSyntheticLambda1;-><init>(Landroid/net/TetheringManager$4;Landroid/net/TetherStatesParcel;)V
 Landroid/net/TetheringManager$4$$ExternalSyntheticLambda1;->f$0:Landroid/net/TetheringManager$4;
@@ -3619,7 +3635,7 @@ Landroid/net/TetheringManager$4$$ExternalSyntheticLambda6;->f$1:Ljava/util/List;
 Landroid/net/TetheringManager$4$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager$4;-><init>(Landroid/net/TetheringManager;Ljava/util/concurrent/Executor;Landroid/net/TetheringManager$TetheringEventCallback;)V
 Landroid/net/TetheringManager$4;->lambda$onCallbackStarted$1$TetheringManager$4(Landroid/net/TetheringManager$TetheringEventCallback;Landroid/net/TetheringCallbackStartedParcel;)V
-Landroid/net/TetheringManager$4;->lambda$onCallbackStopped$2$TetheringManager$4(I)V
+Landroid/net/TetheringManager$4;->lambda$onCallbackStopped$2(I)V
 Landroid/net/TetheringManager$4;->lambda$onConfigurationChanged$3$TetheringManager$4(Landroid/net/TetheringConfigurationParcel;)V
 Landroid/net/TetheringManager$4;->lambda$onOffloadStatusChanged$6(Landroid/net/TetheringManager$TetheringEventCallback;I)V
 Landroid/net/TetheringManager$4;->lambda$onTetherClientsChanged$5(Landroid/net/TetheringManager$TetheringEventCallback;Ljava/util/List;)V
@@ -3657,7 +3673,7 @@ Landroid/net/TetheringManager$RequestDispatcher$1;-><init>(Landroid/net/Tetherin
 Landroid/net/TetheringManager$RequestDispatcher$1;->onResult(I)V
 Landroid/net/TetheringManager$RequestDispatcher$1;->this$1:Landroid/net/TetheringManager$RequestDispatcher;
 Landroid/net/TetheringManager$RequestDispatcher;-><init>(Landroid/net/TetheringManager;)V
-Landroid/net/TetheringManager$RequestDispatcher;->access$100(Landroid/net/TetheringManager$RequestDispatcher;)Landroid/os/ConditionVariable;
+Landroid/net/TetheringManager$RequestDispatcher;->access$000(Landroid/net/TetheringManager$RequestDispatcher;)Landroid/os/ConditionVariable;
 Landroid/net/TetheringManager$RequestDispatcher;->lambda$waitForResult$0$TetheringManager$RequestDispatcher(Landroid/net/TetheringManager$RequestHelper;Landroid/net/ITetheringConnector;)V
 Landroid/net/TetheringManager$RequestDispatcher;->mListener:Landroid/net/IIntResultListener;
 Landroid/net/TetheringManager$RequestDispatcher;->mRemoteResult:I
@@ -3667,9 +3683,12 @@ Landroid/net/TetheringManager$RequestDispatcher;->waitForResult(Landroid/net/Tet
 Landroid/net/TetheringManager$RequestHelper;->runRequest(Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
 Landroid/net/TetheringManager$StartTetheringCallback;->onTetheringFailed(I)V,system-api,test-api
 Landroid/net/TetheringManager$StartTetheringCallback;->onTetheringStarted()V,system-api,test-api
+Landroid/net/TetheringManager$TetheredInterfaceCallback;->onAvailable(Ljava/lang/String;)V
+Landroid/net/TetheringManager$TetheredInterfaceCallback;->onUnavailable()V
+Landroid/net/TetheringManager$TetheredInterfaceRequest;->release()V
 Landroid/net/TetheringManager$TetheringCallbackInternal;-><init>(Landroid/net/TetheringManager;)V
-Landroid/net/TetheringManager$TetheringCallbackInternal;-><init>(Landroid/net/TetheringManager;Landroid/net/TetheringManager$1;)V
 Landroid/net/TetheringManager$TetheringCallbackInternal;->mError:I
+Landroid/net/TetheringManager$TetheringCallbackInternal;->mTetheringMgrRef:Ljava/lang/ref/WeakReference;
 Landroid/net/TetheringManager$TetheringCallbackInternal;->mWaitForCallback:Landroid/os/ConditionVariable;
 Landroid/net/TetheringManager$TetheringCallbackInternal;->onCallbackStarted(Landroid/net/TetheringCallbackStartedParcel;)V
 Landroid/net/TetheringManager$TetheringCallbackInternal;->onCallbackStopped(I)V
@@ -3678,7 +3697,6 @@ Landroid/net/TetheringManager$TetheringCallbackInternal;->onOffloadStatusChanged
 Landroid/net/TetheringManager$TetheringCallbackInternal;->onTetherClientsChanged(Ljava/util/List;)V
 Landroid/net/TetheringManager$TetheringCallbackInternal;->onTetherStatesChanged(Landroid/net/TetherStatesParcel;)V
 Landroid/net/TetheringManager$TetheringCallbackInternal;->onUpstreamChanged(Landroid/net/Network;)V
-Landroid/net/TetheringManager$TetheringCallbackInternal;->this$0:Landroid/net/TetheringManager;
 Landroid/net/TetheringManager$TetheringCallbackInternal;->waitForStarted()V
 Landroid/net/TetheringManager$TetheringEventCallback;->onClientsChanged(Ljava/util/Collection;)V,system-api,test-api
 Landroid/net/TetheringManager$TetheringEventCallback;->onError(Landroid/net/TetheringInterface;I)V,system-api,test-api
@@ -3711,7 +3729,7 @@ Landroid/net/TetheringManager$TetheringRequest$Builder;->setShouldShowEntitlemen
 Landroid/net/TetheringManager$TetheringRequest$Builder;->setStaticIpv4Addresses(Landroid/net/LinkAddress;Landroid/net/LinkAddress;)Landroid/net/TetheringManager$TetheringRequest$Builder;,system-api,test-api
 Landroid/net/TetheringManager$TetheringRequest;-><init>(Landroid/net/TetheringRequestParcel;)V
 Landroid/net/TetheringManager$TetheringRequest;-><init>(Landroid/net/TetheringRequestParcel;Landroid/net/TetheringManager$1;)V
-Landroid/net/TetheringManager$TetheringRequest;->access$600(II)Z
+Landroid/net/TetheringManager$TetheringRequest;->access$500(II)Z
 Landroid/net/TetheringManager$TetheringRequest;->checkConnectivityScope(II)Z
 Landroid/net/TetheringManager$TetheringRequest;->checkStaticAddressConfiguration(Landroid/net/LinkAddress;Landroid/net/LinkAddress;)Z
 Landroid/net/TetheringManager$TetheringRequest;->getClientStaticIpv4Address()Landroid/net/LinkAddress;,system-api,test-api
@@ -3764,10 +3782,11 @@ Landroid/net/TetheringManager;->TETHER_ERROR_UNTETHER_IFACE_ERROR:I,system-api,t
 Landroid/net/TetheringManager;->TETHER_HARDWARE_OFFLOAD_FAILED:I,system-api,test-api
 Landroid/net/TetheringManager;->TETHER_HARDWARE_OFFLOAD_STARTED:I,system-api,test-api
 Landroid/net/TetheringManager;->TETHER_HARDWARE_OFFLOAD_STOPPED:I,system-api,test-api
-Landroid/net/TetheringManager;->access$200(Landroid/net/TetheringManager;Landroid/net/TetheringManager$ConnectorConsumer;)V
-Landroid/net/TetheringManager;->access$300(Landroid/net/TetheringManager;I)V
-Landroid/net/TetheringManager;->access$402(Landroid/net/TetheringManager;Landroid/net/TetheringConfigurationParcel;)Landroid/net/TetheringConfigurationParcel;
-Landroid/net/TetheringManager;->access$502(Landroid/net/TetheringManager;Landroid/net/TetherStatesParcel;)Landroid/net/TetherStatesParcel;
+Landroid/net/TetheringManager;->access$100(Landroid/net/TetheringManager;Landroid/net/TetheringManager$ConnectorConsumer;)V
+Landroid/net/TetheringManager;->access$200(I)V
+Landroid/net/TetheringManager;->access$302(Landroid/net/TetheringManager;Landroid/net/TetheringConfigurationParcel;)Landroid/net/TetheringConfigurationParcel;
+Landroid/net/TetheringManager;->access$402(Landroid/net/TetheringManager;Landroid/net/TetherStatesParcel;)Landroid/net/TetherStatesParcel;
+Landroid/net/TetheringManager;->finalize()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TetheringManager;->getAttributionTag()Ljava/lang/String;
 Landroid/net/TetheringManager;->getConnector(Landroid/net/TetheringManager$ConnectorConsumer;)V
 Landroid/net/TetheringManager;->getLastTetherError(Ljava/lang/String;)I
@@ -3780,18 +3799,20 @@ Landroid/net/TetheringManager;->getTetheredIfaces()[Ljava/lang/String;
 Landroid/net/TetheringManager;->getTetheringErroredIfaces()[Ljava/lang/String;
 Landroid/net/TetheringManager;->isTetheringSupported()Z
 Landroid/net/TetheringManager;->isTetheringSupported(Ljava/lang/String;)Z
-Landroid/net/TetheringManager;->lambda$isTetheringSupported$10$TetheringManager(Ljava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
+Landroid/net/TetheringManager;->lambda$finalize$1$TetheringManager(Ljava/lang/String;Landroid/net/ITetheringConnector;)V
+Landroid/net/TetheringManager;->lambda$isTetheringSupported$11$TetheringManager(Ljava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
 Landroid/net/TetheringManager;->lambda$new$0$TetheringManager(Ljava/lang/String;Landroid/net/ITetheringConnector;)V
-Landroid/net/TetheringManager;->lambda$registerTetheringEventCallback$8(Landroid/net/ITetheringEventCallback;Ljava/lang/String;Landroid/net/ITetheringConnector;)V
-Landroid/net/TetheringManager;->lambda$requestLatestTetheringEntitlementResult$7$TetheringManager(ILandroid/os/ResultReceiver;ZLjava/lang/String;Landroid/net/ITetheringConnector;)V
-Landroid/net/TetheringManager;->lambda$setUsbTethering$4$TetheringManager(ZLjava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
-Landroid/net/TetheringManager;->lambda$startPollingForConnector$1$TetheringManager()V
-Landroid/net/TetheringManager;->lambda$startTethering$5$TetheringManager(Landroid/net/TetheringManager$TetheringRequest;Ljava/lang/String;Landroid/net/IIntResultListener;Landroid/net/ITetheringConnector;)V
-Landroid/net/TetheringManager;->lambda$stopAllTethering$11$TetheringManager(Ljava/lang/String;Landroid/net/ITetheringConnector;)V
-Landroid/net/TetheringManager;->lambda$stopTethering$6$TetheringManager(ILjava/lang/String;Landroid/net/ITetheringConnector;)V
-Landroid/net/TetheringManager;->lambda$tether$2$TetheringManager(Ljava/lang/String;Ljava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
-Landroid/net/TetheringManager;->lambda$unregisterTetheringEventCallback$9(Landroid/net/ITetheringEventCallback;Ljava/lang/String;Landroid/net/ITetheringConnector;)V
-Landroid/net/TetheringManager;->lambda$untether$3$TetheringManager(Ljava/lang/String;Ljava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
+Landroid/net/TetheringManager;->lambda$registerTetheringEventCallback$9(Landroid/net/ITetheringEventCallback;Ljava/lang/String;Landroid/net/ITetheringConnector;)V
+Landroid/net/TetheringManager;->lambda$requestLatestTetheringEntitlementResult$8$TetheringManager(ILandroid/os/ResultReceiver;ZLjava/lang/String;Landroid/net/ITetheringConnector;)V
+Landroid/net/TetheringManager;->lambda$setPreferTestNetworks$13(ZLandroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
+Landroid/net/TetheringManager;->lambda$setUsbTethering$5$TetheringManager(ZLjava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
+Landroid/net/TetheringManager;->lambda$startPollingForConnector$2$TetheringManager()V
+Landroid/net/TetheringManager;->lambda$startTethering$6$TetheringManager(Landroid/net/TetheringManager$TetheringRequest;Ljava/lang/String;Landroid/net/IIntResultListener;Landroid/net/ITetheringConnector;)V
+Landroid/net/TetheringManager;->lambda$stopAllTethering$12$TetheringManager(Ljava/lang/String;Landroid/net/ITetheringConnector;)V
+Landroid/net/TetheringManager;->lambda$stopTethering$7$TetheringManager(ILjava/lang/String;Landroid/net/ITetheringConnector;)V
+Landroid/net/TetheringManager;->lambda$tether$3$TetheringManager(Ljava/lang/String;Ljava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
+Landroid/net/TetheringManager;->lambda$unregisterTetheringEventCallback$10(Landroid/net/ITetheringEventCallback;Ljava/lang/String;Landroid/net/ITetheringConnector;)V
+Landroid/net/TetheringManager;->lambda$untether$4$TetheringManager(Ljava/lang/String;Ljava/lang/String;Landroid/net/ITetheringConnector;Landroid/net/IIntResultListener;)V
 Landroid/net/TetheringManager;->mCallback:Landroid/net/TetheringManager$TetheringCallbackInternal;
 Landroid/net/TetheringManager;->mConnector:Landroid/net/ITetheringConnector;
 Landroid/net/TetheringManager;->mConnectorSupplier:Ljava/util/function/Supplier;
@@ -3804,6 +3825,7 @@ Landroid/net/TetheringManager;->onTetheringConnected(Landroid/net/ITetheringConn
 Landroid/net/TetheringManager;->registerTetheringEventCallback(Ljava/util/concurrent/Executor;Landroid/net/TetheringManager$TetheringEventCallback;)V,system-api,test-api
 Landroid/net/TetheringManager;->requestLatestTetheringEntitlementResult(ILandroid/os/ResultReceiver;Z)V
 Landroid/net/TetheringManager;->requestLatestTetheringEntitlementResult(IZLjava/util/concurrent/Executor;Landroid/net/TetheringManager$OnTetheringEntitlementResultListener;)V,system-api,test-api
+Landroid/net/TetheringManager;->setPreferTestNetworks(Z)V
 Landroid/net/TetheringManager;->setUsbTethering(Z)I
 Landroid/net/TetheringManager;->startPollingForConnector()V
 Landroid/net/TetheringManager;->startTethering(ILjava/util/concurrent/Executor;Landroid/net/TetheringManager$StartTetheringCallback;)V
@@ -3902,6 +3924,25 @@ Landroid/net/apf/ApfCapabilities;->maximumApfProgramSize:I,system-api,test-api
 Landroid/net/apf/ApfCapabilities;->sResources:Landroid/net/ConnectivityResources;
 Landroid/net/apf/ApfCapabilities;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/apf/ApfCapabilities;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/connectivity/framework/modules/utils/build/SdkLevel;-><init>()V
+Landroid/net/connectivity/framework/modules/utils/build/SdkLevel;->isAtLeastPreReleaseCodename(Ljava/lang/String;)Z
+Landroid/net/connectivity/framework/modules/utils/build/SdkLevel;->isAtLeastR()Z
+Landroid/net/connectivity/framework/modules/utils/build/SdkLevel;->isAtLeastS()Z
+Landroid/net/connectivity/framework/modules/utils/build/SdkLevel;->isAtLeastT()Z
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;-><clinit>()V
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;-><init>(ILjava/lang/String;)V
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->isAtLeast(Ljava/lang/String;)Z
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->isAtLeastInternal(Ljava/lang/String;)Z
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->isAtMost(Ljava/lang/String;)Z
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->isAtMostInternal(Ljava/lang/String;)Z
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->isCodename(Ljava/lang/String;)Z
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->mCodename:Ljava/lang/String;
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->mIsReleaseBuild:Z
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->mSdkInt:I
+Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;->sInstance:Landroid/net/connectivity/framework/modules/utils/build/UnboundedSdkLevel;
+Landroid/net/connectivity/framework/util/BinderUtils$ThrowingRunnable;->run()V
+Landroid/net/connectivity/framework/util/BinderUtils;-><init>()V
+Landroid/net/connectivity/framework/util/BinderUtils;->withCleanCallingIdentity(Landroid/net/connectivity/framework/util/BinderUtils$ThrowingRunnable;)V
 Landroid/net/connectivity/framework/util/CollectionUtils;-><init>()V
 Landroid/net/connectivity/framework/util/CollectionUtils;->all(Ljava/util/Collection;Ljava/util/function/Predicate;)Z
 Landroid/net/connectivity/framework/util/CollectionUtils;->any(Landroid/util/SparseArray;Ljava/util/function/Predicate;)Z
@@ -4021,6 +4062,19 @@ Landroid/net/connectivity/framework/util/InetAddressUtils;-><init>()V
 Landroid/net/connectivity/framework/util/InetAddressUtils;->INET6_ADDR_LENGTH:I
 Landroid/net/connectivity/framework/util/InetAddressUtils;->parcelInetAddress(Landroid/os/Parcel;Ljava/net/InetAddress;I)V
 Landroid/net/connectivity/framework/util/InetAddressUtils;->unparcelInetAddress(Landroid/os/Parcel;)Ljava/net/InetAddress;
+Landroid/net/connectivity/framework/util/InterfaceParams;-><init>(Ljava/lang/String;ILandroid/net/MacAddress;)V
+Landroid/net/connectivity/framework/util/InterfaceParams;-><init>(Ljava/lang/String;ILandroid/net/MacAddress;I)V
+Landroid/net/connectivity/framework/util/InterfaceParams;->ETHER_MTU:I
+Landroid/net/connectivity/framework/util/InterfaceParams;->IPV6_MIN_MTU:I
+Landroid/net/connectivity/framework/util/InterfaceParams;->defaultMtu:I
+Landroid/net/connectivity/framework/util/InterfaceParams;->getByName(Ljava/lang/String;)Landroid/net/connectivity/framework/util/InterfaceParams;
+Landroid/net/connectivity/framework/util/InterfaceParams;->getMacAddress(Ljava/net/NetworkInterface;)Landroid/net/MacAddress;
+Landroid/net/connectivity/framework/util/InterfaceParams;->getNetworkInterfaceByName(Ljava/lang/String;)Ljava/net/NetworkInterface;
+Landroid/net/connectivity/framework/util/InterfaceParams;->hasMacAddress:Z
+Landroid/net/connectivity/framework/util/InterfaceParams;->index:I
+Landroid/net/connectivity/framework/util/InterfaceParams;->macAddr:Landroid/net/MacAddress;
+Landroid/net/connectivity/framework/util/InterfaceParams;->name:Ljava/lang/String;
+Landroid/net/connectivity/framework/util/InterfaceParams;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/framework/util/IpRange;-><init>(Landroid/net/IpPrefix;)V
 Landroid/net/connectivity/framework/util/IpRange;-><init>(Ljava/net/InetAddress;Ljava/net/InetAddress;)V
 Landroid/net/connectivity/framework/util/IpRange;->SIGNUM_POSITIVE:I
@@ -4090,7 +4144,7 @@ Landroid/net/connectivity/framework/util/LocationPermissionChecker;->mContext:La
 Landroid/net/connectivity/framework/util/LocationPermissionChecker;->noteAppOpAllowed(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Z
 Landroid/net/connectivity/framework/util/MacAddressUtils;-><clinit>()V
 Landroid/net/connectivity/framework/util/MacAddressUtils;-><init>()V
-Landroid/net/connectivity/framework/util/MacAddressUtils;->DEFAULT_MAC_ADDRESS:Ljava/lang/String;
+Landroid/net/connectivity/framework/util/MacAddressUtils;->DEFAULT_MAC_ADDRESS:Landroid/net/MacAddress;
 Landroid/net/connectivity/framework/util/MacAddressUtils;->ETHER_ADDR_LEN:I
 Landroid/net/connectivity/framework/util/MacAddressUtils;->LOCALLY_ASSIGNED_MASK:J
 Landroid/net/connectivity/framework/util/MacAddressUtils;->MULTICAST_MASK:J
@@ -4233,6 +4287,7 @@ Landroid/net/connectivity/framework/util/ProxyUtils;->PROXY_VALID:I
 Landroid/net/connectivity/framework/util/ProxyUtils;->exclusionListAsString([Ljava/lang/String;)Ljava/lang/String;
 Landroid/net/connectivity/framework/util/ProxyUtils;->exclusionStringAsList(Ljava/lang/String;)Ljava/util/List;
 Landroid/net/connectivity/framework/util/ProxyUtils;->validate(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
+Landroid/net/connectivity/framework/util/RouteUtils;-><init>()V
 Landroid/net/util/DnsUtils$Rfc6724Comparator;-><init>()V
 Landroid/net/util/DnsUtils$Rfc6724Comparator;->compare(Landroid/net/util/DnsUtils$SortableAddress;Landroid/net/util/DnsUtils$SortableAddress;)I
 Landroid/net/util/DnsUtils$Rfc6724Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,system-api,test-api
diff --git a/current/sdk_library/module-lib/framework-connectivity-stubs.jar b/current/sdk_library/module-lib/framework-connectivity-stubs.jar
index e67f9b0..f348b37 100644
--- a/current/sdk_library/module-lib/framework-connectivity-stubs.jar
+++ b/current/sdk_library/module-lib/framework-connectivity-stubs.jar
diff --git a/current/sdk_library/module-lib/framework-connectivity.srcjar b/current/sdk_library/module-lib/framework-connectivity.srcjar
index 0007d17..4b5ae9f 100644
--- a/current/sdk_library/module-lib/framework-connectivity.srcjar
+++ b/current/sdk_library/module-lib/framework-connectivity.srcjar
diff --git a/current/sdk_library/module-lib/framework-connectivity_annotations.zip b/current/sdk_library/module-lib/framework-connectivity_annotations.zip
new file mode 100644
index 0000000..4f106df
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-connectivity_annotations.zip
diff --git a/current/sdk_library/module-lib/framework-tethering-stubs.jar b/current/sdk_library/module-lib/framework-tethering-stubs.jar
index 4d17fbd..b5e074d 100644
--- a/current/sdk_library/module-lib/framework-tethering-stubs.jar
+++ b/current/sdk_library/module-lib/framework-tethering-stubs.jar
diff --git a/current/sdk_library/module-lib/framework-tethering.srcjar b/current/sdk_library/module-lib/framework-tethering.srcjar
index c9d8204..ea596e9 100644
--- a/current/sdk_library/module-lib/framework-tethering.srcjar
+++ b/current/sdk_library/module-lib/framework-tethering.srcjar
diff --git a/current/sdk_library/module-lib/framework-tethering.txt b/current/sdk_library/module-lib/framework-tethering.txt
index 0566040..460c216 100644
--- a/current/sdk_library/module-lib/framework-tethering.txt
+++ b/current/sdk_library/module-lib/framework-tethering.txt
@@ -27,6 +27,15 @@ package android.net {
     method @Deprecated public int untether(@NonNull String);
   }
 
+  public static interface TetheringManager.TetheredInterfaceCallback {
+    method public void onAvailable(@NonNull String);
+    method public void onUnavailable();
+  }
+
+  public static interface TetheringManager.TetheredInterfaceRequest {
+    method public void release();
+  }
+
   public static interface TetheringManager.TetheringEventCallback {
     method @Deprecated public default void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);
   }
diff --git a/current/sdk_library/module-lib/framework-tethering_annotations.zip b/current/sdk_library/module-lib/framework-tethering_annotations.zip
new file mode 100644
index 0000000..3dabacc
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-tethering_annotations.zip
diff --git a/current/sdk_library/public/framework-connectivity-stubs.jar b/current/sdk_library/public/framework-connectivity-stubs.jar
index faa15f9..8fc8d6b 100644
--- a/current/sdk_library/public/framework-connectivity-stubs.jar
+++ b/current/sdk_library/public/framework-connectivity-stubs.jar
diff --git a/current/sdk_library/public/framework-connectivity.srcjar b/current/sdk_library/public/framework-connectivity.srcjar
index 6d21dc4..b902216 100644
--- a/current/sdk_library/public/framework-connectivity.srcjar
+++ b/current/sdk_library/public/framework-connectivity.srcjar
diff --git a/current/sdk_library/public/framework-connectivity_annotations.zip b/current/sdk_library/public/framework-connectivity_annotations.zip
new file mode 100644
index 0000000..35d11ca
--- /dev/null
+++ b/current/sdk_library/public/framework-connectivity_annotations.zip
diff --git a/current/sdk_library/public/framework-tethering_annotations.zip b/current/sdk_library/public/framework-tethering_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/public/framework-tethering_annotations.zip
diff --git a/current/sdk_library/system/framework-connectivity-stubs.jar b/current/sdk_library/system/framework-connectivity-stubs.jar
index 0759001..eb7d8af 100644
--- a/current/sdk_library/system/framework-connectivity-stubs.jar
+++ b/current/sdk_library/system/framework-connectivity-stubs.jar
diff --git a/current/sdk_library/system/framework-connectivity.srcjar b/current/sdk_library/system/framework-connectivity.srcjar
index c15edaf..b221c9d 100644
--- a/current/sdk_library/system/framework-connectivity.srcjar
+++ b/current/sdk_library/system/framework-connectivity.srcjar
diff --git a/current/sdk_library/system/framework-connectivity.txt b/current/sdk_library/system/framework-connectivity.txt
index d1d51da..cfab872 100644
--- a/current/sdk_library/system/framework-connectivity.txt
+++ b/current/sdk_library/system/framework-connectivity.txt
@@ -279,6 +279,7 @@ package android.net {
     method @Nullable public String getSsid();
     method @NonNull public java.util.Set<java.lang.Integer> getSubscriptionIds();
     method @NonNull public int[] getTransportTypes();
+    method @Nullable public java.util.List<android.net.Network> getUnderlyingNetworks();
     method public boolean isPrivateDnsBroken();
     method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);
     field public static final int NET_CAPABILITY_BIP = 31; // 0x1f
@@ -309,6 +310,7 @@ package android.net {
     method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setSsid(@Nullable String);
     method @NonNull public android.net.NetworkCapabilities.Builder setSubscriptionIds(@NonNull java.util.Set<java.lang.Integer>);
     method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo);
+    method @NonNull public android.net.NetworkCapabilities.Builder setUnderlyingNetworks(@Nullable java.util.List<android.net.Network>);
     method @NonNull public static android.net.NetworkCapabilities.Builder withoutDefaultCapabilities();
   }
 
diff --git a/current/sdk_library/system/framework-connectivity_annotations.zip b/current/sdk_library/system/framework-connectivity_annotations.zip
new file mode 100644
index 0000000..f7b7020
--- /dev/null
+++ b/current/sdk_library/system/framework-connectivity_annotations.zip
diff --git a/current/sdk_library/system/framework-tethering-stubs.jar b/current/sdk_library/system/framework-tethering-stubs.jar
index ba4f8d1..8f18dde 100644
--- a/current/sdk_library/system/framework-tethering-stubs.jar
+++ b/current/sdk_library/system/framework-tethering-stubs.jar
diff --git a/current/sdk_library/system/framework-tethering.srcjar b/current/sdk_library/system/framework-tethering.srcjar
index 00c47c2..bcba969 100644
--- a/current/sdk_library/system/framework-tethering.srcjar
+++ b/current/sdk_library/system/framework-tethering.srcjar
diff --git a/current/sdk_library/system/framework-tethering_annotations.zip b/current/sdk_library/system/framework-tethering_annotations.zip
new file mode 100644
index 0000000..d3235a5
--- /dev/null
+++ b/current/sdk_library/system/framework-tethering_annotations.zip