Drop prebuilt files to android source tree.

snapshot-creation-build-number.txt

Android.bp

LICENSE

framework-connectivity-t_annotations.zip

framework-tethering-removed.txt

framework-connectivity-t.srcjar

framework-connectivity.txt

framework-tethering-stubs.jar

framework-connectivity_annotations.zip

framework-connectivity-stubs.jar

framework-tethering.srcjar

framework-connectivity-t.txt

framework-tethering.txt

framework-connectivity-t-removed.txt

framework-connectivity-t-stubs.jar

framework-connectivity.srcjar

framework-connectivity-removed.txt

framework-tethering_annotations.zip

framework-connectivity-t_annotations.zip

framework-tethering-removed.txt

framework-connectivity-t.srcjar

framework-connectivity.txt

framework-tethering-stubs.jar

framework-connectivity_annotations.zip

framework-connectivity-stubs.jar

framework-tethering.srcjar

framework-connectivity-t.txt

framework-tethering.txt

framework-connectivity-t-removed.txt

framework-connectivity-t-stubs.jar

framework-connectivity.srcjar

framework-connectivity-removed.txt

framework-tethering_annotations.zip

framework-connectivity-t_annotations.zip

framework-tethering-removed.txt

framework-connectivity-t.srcjar

framework-connectivity.txt

framework-tethering-stubs.jar

framework-connectivity_annotations.zip

framework-connectivity-stubs.jar

framework-tethering.srcjar

framework-connectivity-t.txt

framework-tethering.txt

framework-connectivity-t-removed.txt

framework-connectivity-t-stubs.jar

framework-connectivity.srcjar

framework-connectivity-removed.txt

framework-tethering_annotations.zip

service-connectivity.jar

hiddenapi-unsupported.txt

hiddenapi-max-target-r-loprio.txt

metadata.csv

hiddenapi-unsupported-tiramisu.txt

signature-patterns.csv

filtered-stub-flags.csv

filtered-flags.csv

hiddenapi-max-target-o-low-priority-tiramisu.txt

index.csv

annotation-flags.csv

hiddenapi-max-target-o-low-priority.txt

connectivity-t-platform-compat-config_meta.xml

connectivity-platform-compat-config_meta.xml

Built here: ab/T1004614

This build IS suitable for public release.

The change is generated with prebuilt drop tool.

Test: presubmit
Bug: 238423099
Change-Id: Ib61981f79286611cb8b6a4bf6c236abeaa0fd068
Merged-In: Ib61981f79286611cb8b6a4bf6c236abeaa0fd068

23 files changed, 301 insertions, 485 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 6c23479..4c6e424 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1004275"
+    build_id: "T1004614"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.tethering/sdk/tethering-module-sdk-current.zip"
   }
@@ -8,7 +8,7 @@ drops {
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/Connectivity"
-  git_branch: "tm-dev"
+  git_branch: "master"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/current/Android.bp b/current/Android.bp
index 89841be..cdac980 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,16 +1,5 @@
 // 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_import",
-        "module_java_sdk_library_import",
-        "module_prebuilt_bootclasspath_fragment",
-        "module_prebuilt_systemserverclasspath_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.
@@ -18,49 +7,11 @@ package {
 }
 
 prebuilt_bootclasspath_fragment {
-    name: "tethering-module-sdk_com.android.tethering-bootclasspath-fragment@current",
-    sdk_member_name: "com.android.tethering-bootclasspath-fragment",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.tethering"],
-    licenses: ["tethering-module-sdk_Android-Apache-2.0@current"],
-    contents: [
-        "tethering-module-sdk_framework-connectivity@current",
-        "tethering-module-sdk_framework-connectivity-t@current",
-        "tethering-module-sdk_framework-tethering@current",
-    ],
-    fragments: [
-        {
-            apex: "com.android.art",
-            module: "art-bootclasspath-fragment",
-        },
-    ],
-    hidden_api: {
-        unsupported: [
-            "hiddenapi/hiddenapi-unsupported.txt",
-            "hiddenapi/hiddenapi-unsupported-tiramisu.txt",
-        ],
-        max_target_r_low_priority: ["hiddenapi/hiddenapi-max-target-r-loprio.txt"],
-        max_target_o_low_priority: [
-            "hiddenapi/hiddenapi-max-target-o-low-priority.txt",
-            "hiddenapi/hiddenapi-max-target-o-low-priority-tiramisu.txt",
-        ],
-        annotation_flags: "hiddenapi/annotation-flags.csv",
-        metadata: "hiddenapi/metadata.csv",
-        index: "hiddenapi/index.csv",
-        signature_patterns: "hiddenapi/signature-patterns.csv",
-        filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
-        filtered_flags: "hiddenapi/filtered-flags.csv",
-    },
-}
-
-module_prebuilt_bootclasspath_fragment {
     name: "com.android.tethering-bootclasspath-fragment",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
@@ -95,48 +46,36 @@ module_prebuilt_bootclasspath_fragment {
     },
 }
 
-java_sdk_library_import {
-    name: "tethering-module-sdk_framework-connectivity@current",
-    sdk_member_name: "framework-connectivity",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.tethering"],
-    licenses: ["tethering-module-sdk_Android-Apache-2.0@current"],
-    shared_library: false,
-    permitted_packages: ["android.net"],
-    public: {
-        jars: ["sdk_library/public/framework-connectivity-stubs.jar"],
-        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: {
-        jars: ["sdk_library/system/framework-connectivity-stubs.jar"],
-        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",
+prebuilt_platform_compat_config {
+    name: "connectivity-platform-compat-config",
+    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
-    module_lib: {
-        jars: ["sdk_library/module-lib/framework-connectivity-stubs.jar"],
-        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",
+    visibility: ["//visibility:public"],
+    licenses: ["tethering-module-sdk_Android-Apache-2.0"],
+    metadata: "compat_configs/connectivity-platform-compat-config/connectivity-platform-compat-config_meta.xml",
+}
+
+prebuilt_platform_compat_config {
+    name: "connectivity-t-platform-compat-config",
+    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
+    visibility: ["//visibility:public"],
+    licenses: ["tethering-module-sdk_Android-Apache-2.0"],
+    metadata: "compat_configs/connectivity-t-platform-compat-config/connectivity-t-platform-compat-config_meta.xml",
 }
 
-module_java_sdk_library_import {
+java_sdk_library_import {
     name: "framework-connectivity",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
@@ -170,54 +109,11 @@ module_java_sdk_library_import {
 }
 
 java_sdk_library_import {
-    name: "tethering-module-sdk_framework-connectivity-t@current",
-    sdk_member_name: "framework-connectivity-t",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.tethering"],
-    licenses: ["tethering-module-sdk_Android-Apache-2.0@current"],
-    shared_library: false,
-    permitted_packages: [
-        "android.app.usage",
-        "android.net",
-        "android.net.nsd",
-        "android.nearby",
-        "com.android.connectivity",
-        "com.android.nearby",
-    ],
-    public: {
-        jars: ["sdk_library/public/framework-connectivity-t-stubs.jar"],
-        stub_srcs: ["sdk_library/public/framework-connectivity-t.srcjar"],
-        current_api: "sdk_library/public/framework-connectivity-t.txt",
-        removed_api: "sdk_library/public/framework-connectivity-t-removed.txt",
-        annotations: "sdk_library/public/framework-connectivity-t_annotations.zip",
-        sdk_version: "module_current",
-    },
-    system: {
-        jars: ["sdk_library/system/framework-connectivity-t-stubs.jar"],
-        stub_srcs: ["sdk_library/system/framework-connectivity-t.srcjar"],
-        current_api: "sdk_library/system/framework-connectivity-t.txt",
-        removed_api: "sdk_library/system/framework-connectivity-t-removed.txt",
-        annotations: "sdk_library/system/framework-connectivity-t_annotations.zip",
-        sdk_version: "module_current",
-    },
-    module_lib: {
-        jars: ["sdk_library/module-lib/framework-connectivity-t-stubs.jar"],
-        stub_srcs: ["sdk_library/module-lib/framework-connectivity-t.srcjar"],
-        current_api: "sdk_library/module-lib/framework-connectivity-t.txt",
-        removed_api: "sdk_library/module-lib/framework-connectivity-t-removed.txt",
-        annotations: "sdk_library/module-lib/framework-connectivity-t_annotations.zip",
-        sdk_version: "module_current",
-    },
-}
-
-module_java_sdk_library_import {
     name: "framework-connectivity-t",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
@@ -258,47 +154,11 @@ module_java_sdk_library_import {
 }
 
 java_sdk_library_import {
-    name: "tethering-module-sdk_framework-tethering@current",
-    sdk_member_name: "framework-tethering",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.tethering"],
-    licenses: ["tethering-module-sdk_Android-Apache-2.0@current"],
-    shared_library: false,
-    permitted_packages: ["android.net"],
-    public: {
-        jars: ["sdk_library/public/framework-tethering-stubs.jar"],
-        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: {
-        jars: ["sdk_library/system/framework-tethering-stubs.jar"],
-        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: {
-        jars: ["sdk_library/module-lib/framework-tethering-stubs.jar"],
-        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",
-    },
-}
-
-module_java_sdk_library_import {
     name: "framework-tethering",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
@@ -332,22 +192,11 @@ module_java_sdk_library_import {
 }
 
 java_import {
-    name: "tethering-module-sdk_service-connectivity@current",
-    sdk_member_name: "service-connectivity",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.tethering"],
-    licenses: ["tethering-module-sdk_Android-Apache-2.0@current"],
-    jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-connectivity.jar"],
-}
-
-module_java_import {
     name: "service-connectivity",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
@@ -356,14 +205,6 @@ module_java_import {
 }
 
 license {
-    name: "tethering-module-sdk_Android-Apache-2.0@current",
-    sdk_member_name: "Android-Apache-2.0",
-    visibility: ["//visibility:private"],
-    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
-    license_text: ["licenses/build/soong/licenses/LICENSE"],
-}
-
-license {
     name: "tethering-module-sdk_Android-Apache-2.0",
     visibility: ["//visibility:private"],
     license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -371,38 +212,14 @@ license {
 }
 
 prebuilt_systemserverclasspath_fragment {
-    name: "tethering-module-sdk_com.android.tethering-systemserverclasspath-fragment@current",
-    sdk_member_name: "com.android.tethering-systemserverclasspath-fragment",
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.tethering"],
-    licenses: ["tethering-module-sdk_Android-Apache-2.0@current"],
-    standalone_contents: ["tethering-module-sdk_service-connectivity@current"],
-}
-
-module_prebuilt_systemserverclasspath_fragment {
     name: "com.android.tethering-systemserverclasspath-fragment",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "ANDROID",
+        var_name: "module_build_from_source",
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0"],
     standalone_contents: ["service-connectivity"],
 }
-
-sdk_snapshot {
-    name: "tethering-module-sdk@current",
-    visibility: ["//visibility:public"],
-    bootclasspath_fragments: ["tethering-module-sdk_com.android.tethering-bootclasspath-fragment@current"],
-    java_sdk_libs: [
-        "tethering-module-sdk_framework-connectivity@current",
-        "tethering-module-sdk_framework-connectivity-t@current",
-        "tethering-module-sdk_framework-tethering@current",
-    ],
-    java_systemserver_libs: ["tethering-module-sdk_service-connectivity@current"],
-    systemserverclasspath_fragments: ["tethering-module-sdk_com.android.tethering-systemserverclasspath-fragment@current"],
-}
diff --git a/current/compat_configs/connectivity-platform-compat-config/connectivity-platform-compat-config_meta.xml b/current/compat_configs/connectivity-platform-compat-config/connectivity-platform-compat-config_meta.xml
new file mode 100644
index 0000000..25dc2c1
--- /dev/null
+++ b/current/compat_configs/connectivity-platform-compat-config/connectivity-platform-compat-config_meta.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<config>
+  <compat-change description="The {@link #getRoutes()} now can contain excluded as well as included routes. Use {@link RouteInfo#getType()} to determine route type." enableAfterTargetSdk="32" id="186082280" name="EXCLUDED_ROUTES">
+    <meta-data definedIn="android.net.LinkProperties" sourcePosition="packages/modules/Connectivity/framework/src/android/net/LinkProperties.java:67" />
+  </compat-change>
+</config>
\ No newline at end of file
diff --git a/current/compat_configs/connectivity-t-platform-compat-config/connectivity-t-platform-compat-config_meta.xml b/current/compat_configs/connectivity-t-platform-compat-config/connectivity-t-platform-compat-config_meta.xml
new file mode 100644
index 0000000..340608e
--- /dev/null
+++ b/current/compat_configs/connectivity-t-platform-compat-config/connectivity-t-platform-compat-config_meta.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<config>
+  <compat-change description="When enabled, apps targeting &lt; Android 12 are considered legacy for the NSD native daemon. The platform will only keep the daemon running as long as there are any legacy apps connected. After Android 12, direct communication with the native daemon might not work since the native daemon won't always stay alive. Using the NSD APIs from NsdManager as the replacement is recommended. Another alternative could be bundling your own mdns solutions instead of depending on the system mdns native daemon. This compatibility change applies to Android 13 and later only. To toggle behavior on Android 12 and Android 12L, use RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS." enableSinceTargetSdk="31" id="235355681" name="RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS_T_AND_LATER">
+    <meta-data definedIn="android.net.nsd.NsdManager" sourcePosition="packages/modules/Connectivity/framework-t/src/android/net/nsd/NsdManager.java:153" />
+  </compat-change>
+</config>
\ No newline at end of file
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 0e70c06..2c805a8 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -150,8 +150,10 @@ Landroid/nearby/DataElement$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,sy
 Landroid/nearby/DataElement;-><init>(I[B)V,sdk,system-api,test-api
 Landroid/nearby/DataElement;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
 Landroid/nearby/DataElement;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/nearby/DataElement;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/nearby/DataElement;->getKey()I,sdk,system-api,test-api
 Landroid/nearby/DataElement;->getValue()[B,sdk,system-api,test-api
+Landroid/nearby/DataElement;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/nearby/DataElement;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/nearby/FastPairDataProviderService;->onBind(Landroid/content/Intent;)Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/nearby/FastPairDevice$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -249,6 +251,7 @@ Landroid/nearby/PresenceDevice$Builder;->setName(Ljava/lang/String;)Landroid/nea
 Landroid/nearby/PresenceDevice$Builder;->setRssi(I)Landroid/nearby/PresenceDevice$Builder;,sdk,system-api,test-api
 Landroid/nearby/PresenceDevice;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
 Landroid/nearby/PresenceDevice;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/nearby/PresenceDevice;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/nearby/PresenceDevice;->getDeviceId()Ljava/lang/String;,sdk,system-api,test-api
 Landroid/nearby/PresenceDevice;->getDeviceImageUrl()Ljava/lang/String;,sdk,system-api,test-api
 Landroid/nearby/PresenceDevice;->getDeviceType()I,sdk,system-api,test-api
@@ -257,6 +260,7 @@ Landroid/nearby/PresenceDevice;->getEncryptedIdentity()[B,sdk,system-api,test-ap
 Landroid/nearby/PresenceDevice;->getExtendedProperties()Ljava/util/List;,sdk,system-api,test-api
 Landroid/nearby/PresenceDevice;->getSalt()[B,sdk,system-api,test-api
 Landroid/nearby/PresenceDevice;->getSecretId()[B,sdk,system-api,test-api
+Landroid/nearby/PresenceDevice;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/nearby/PresenceDevice;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/nearby/PresenceScanFilter$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/nearby/PresenceScanFilter$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -456,10 +460,6 @@ Landroid/net/CaptivePortalData;->isCaptive()Z,sdk,system-api,test-api
 Landroid/net/CaptivePortalData;->isSessionExtendable()Z,sdk,system-api,test-api
 Landroid/net/CaptivePortalData;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/CaptivePortalData;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/ConnectionInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/ConnectionInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/ConnectionInfo;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/net/ConnectionInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/ConnectivityDiagnosticsManager$ConnectivityDiagnosticsBinder$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/ConnectivityDiagnosticsManager$ConnectivityDiagnosticsBinder$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/ConnectivityDiagnosticsManager$ConnectivityDiagnosticsBinder$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -821,7 +821,6 @@ Landroid/net/ConnectivityManager;->unregisterQosCallback(Landroid/net/QosCallbac
 Landroid/net/ConnectivityManager;->unregisterTetheringEventCallback(Landroid/net/ConnectivityManager$OnTetheringEventCallback;)V,sdk,system-api,test-api
 Landroid/net/ConnectivityManager;->unsupportedStartingFrom(I)V,lo-prio,max-target-o
 Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,unsupported
-Landroid/net/ConnectivityResources$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/ConnectivityThread$Singleton;-><init>()V,lo-prio,max-target-o
 Landroid/net/ConnectivityThread$Singleton;->INSTANCE:Landroid/net/ConnectivityThread;,lo-prio,max-target-o
 Landroid/net/ConnectivityThread;-><init>()V,lo-prio,max-target-o
@@ -1221,10 +1220,6 @@ Landroid/net/IIpSecService;->openUdpEncapsulationSocket(ILandroid/os/IBinder;)La
 Landroid/net/IIpSecService;->releaseSecurityParameterIndex(I)V,lo-prio,max-target-o
 Landroid/net/IIpSecService;->removeAddressFromTunnelInterface(ILandroid/net/LinkAddress;Ljava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/IIpSecService;->removeTransportModeTransforms(Landroid/os/ParcelFileDescriptor;)V,lo-prio,max-target-o
-Landroid/net/INetworkActivityListener$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/INetworkActivityListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/INetworkActivityListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/INetworkActivityListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/net/INetworkAgent$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/INetworkAgent$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/INetworkAgent$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
@@ -1233,14 +1228,6 @@ Landroid/net/INetworkAgentRegistry$Default;->asBinder()Landroid/os/IBinder;,publ
 Landroid/net/INetworkAgentRegistry$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/INetworkAgentRegistry$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/INetworkAgentRegistry$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/INetworkInterfaceOutcomeReceiver$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/INetworkInterfaceOutcomeReceiver$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/INetworkInterfaceOutcomeReceiver$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/INetworkInterfaceOutcomeReceiver$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/INetworkOfferCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/INetworkOfferCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/INetworkOfferCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/INetworkOfferCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/net/INetworkStatsService$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/INetworkStatsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,unsupported
 Landroid/net/INetworkStatsService$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
@@ -1316,26 +1303,6 @@ Landroid/net/INetworkStatsSession;->getHistoryIntervalForUid(Landroid/net/Networ
 Landroid/net/INetworkStatsSession;->getRelevantUids()[I,lo-prio,max-target-o
 Landroid/net/INetworkStatsSession;->getSummaryForAllUid(Landroid/net/NetworkTemplate;JJZ)Landroid/net/NetworkStats;,unsupported
 Landroid/net/INetworkStatsSession;->getSummaryForNetwork(Landroid/net/NetworkTemplate;JJ)Landroid/net/NetworkStats;,unsupported
-Landroid/net/IOnCompleteListener$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/IOnCompleteListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/IOnCompleteListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/IOnCompleteListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/IQosCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/IQosCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/IQosCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/IQosCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/ISocketKeepaliveCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/ISocketKeepaliveCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/ISocketKeepaliveCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/ISocketKeepaliveCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/ITestNetworkManager$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/ITestNetworkManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/ITestNetworkManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/ITestNetworkManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/ITetheredInterfaceCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/ITetheredInterfaceCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/ITetheredInterfaceCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/ITetheredInterfaceCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/net/ITetheringConnector$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/ITetheringConnector$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/ITetheringConnector$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
@@ -1859,8 +1826,6 @@ Landroid/net/NattKeepalivePacketData;->describeContents()I,public-api,sdk,system
 Landroid/net/NattKeepalivePacketData;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NattKeepalivePacketData;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/NattKeepalivePacketData;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/NattSocketKeepalive$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/NattSocketKeepalive$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/Network$$ExternalSyntheticLambda0;->lookup(Ljava/lang/String;)Ljava/util/List;,blocked,core-platform-api
 Landroid/net/Network$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/Network$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -2369,9 +2334,7 @@ Landroid/net/NetworkStats$1;->next()Ljava/lang/Object;,core-platform-api,public-
 Landroid/net/NetworkStats$2;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStats$2;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/NetworkStats$Entry;-><init>()V,max-target-r
-Landroid/net/NetworkStats$Entry;-><init>(JJJJJ)V,lo-prio,max-target-o
 Landroid/net/NetworkStats$Entry;-><init>(Ljava/lang/String;IIIIIIJJJJJ)V,sdk,system-api,test-api
-Landroid/net/NetworkStats$Entry;-><init>(Ljava/lang/String;IIIJJJJJ)V,lo-prio,max-target-o
 Landroid/net/NetworkStats$Entry;->add(Landroid/net/NetworkStats$Entry;)V,lo-prio,max-target-o
 Landroid/net/NetworkStats$Entry;->defaultNetwork:I,lo-prio,max-target-o
 Landroid/net/NetworkStats$Entry;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
@@ -2709,19 +2672,11 @@ Landroid/net/QosCallback;-><init>()V,sdk,system-api,test-api
 Landroid/net/QosCallback;->onError(Landroid/net/QosCallbackException;)V,sdk,system-api,test-api
 Landroid/net/QosCallback;->onQosSessionAvailable(Landroid/net/QosSession;Landroid/net/QosSessionAttributes;)V,sdk,system-api,test-api
 Landroid/net/QosCallback;->onQosSessionLost(Landroid/net/QosSession;)V,sdk,system-api,test-api
-Landroid/net/QosCallbackConnection$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/QosCallbackConnection$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/QosCallbackConnection$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/QosCallbackConnection$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/QosCallbackException;-><init>(Ljava/lang/String;)V,sdk,system-api,test-api
 Landroid/net/QosCallbackException;-><init>(Ljava/lang/Throwable;)V,sdk,system-api,test-api
 Landroid/net/QosFilter;->getNetwork()Landroid/net/Network;,sdk,system-api,test-api
 Landroid/net/QosFilter;->matchesLocalAddress(Ljava/net/InetAddress;II)Z,sdk,system-api,test-api
 Landroid/net/QosFilter;->matchesRemoteAddress(Ljava/net/InetAddress;II)Z,sdk,system-api,test-api
-Landroid/net/QosFilterParcelable$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/QosFilterParcelable$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/QosFilterParcelable;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/net/QosFilterParcelable;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/QosSession$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/QosSession$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/QosSession;-><init>(II)V,sdk,system-api,test-api
@@ -2734,9 +2689,6 @@ Landroid/net/QosSession;->getSessionType()I,sdk,system-api,test-api
 Landroid/net/QosSession;->getUniqueId()J,sdk,system-api,test-api
 Landroid/net/QosSession;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/QosSession;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/QosSocketFilter;->getNetwork()Landroid/net/Network;,sdk,system-api,test-api
-Landroid/net/QosSocketFilter;->matchesLocalAddress(Ljava/net/InetAddress;II)Z,sdk,system-api,test-api
-Landroid/net/QosSocketFilter;->matchesRemoteAddress(Ljava/net/InetAddress;II)Z,sdk,system-api,test-api
 Landroid/net/QosSocketInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/QosSocketInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/QosSocketInfo;-><init>(Landroid/net/Network;Ljava/net/Socket;)V,sdk,system-api,test-api
@@ -2860,8 +2812,6 @@ Landroid/net/TcpKeepalivePacketData;->getTcpWindowScale()I,sdk,system-api,test-a
 Landroid/net/TcpKeepalivePacketData;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TcpKeepalivePacketData;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TcpKeepalivePacketData;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/TcpSocketKeepalive$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/TcpSocketKeepalive$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/TestNetworkInterface$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/TestNetworkInterface$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/TestNetworkInterface;->describeContents()I,public-api,sdk,system-api,test-api
@@ -3135,6 +3085,58 @@ Landroid/net/apf/ApfCapabilities;->hasDataAccess()Z,sdk,system-api,test-api
 Landroid/net/apf/ApfCapabilities;->maximumApfProgramSize:I,sdk,system-api,test-api
 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/android/net/ConnectionInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ConnectionInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ConnectionInfo;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ConnectionInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ConnectivityResources$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkActivityListener$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkActivityListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkActivityListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkActivityListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkInterfaceOutcomeReceiver$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkInterfaceOutcomeReceiver$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkInterfaceOutcomeReceiver$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkInterfaceOutcomeReceiver$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkOfferCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkOfferCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkOfferCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkOfferCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/IOnCompleteListener$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/IOnCompleteListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/IOnCompleteListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/IOnCompleteListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/IQosCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/IQosCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/IQosCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/IQosCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ISocketKeepaliveCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ISocketKeepaliveCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ISocketKeepaliveCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ISocketKeepaliveCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ITestNetworkManager$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ITestNetworkManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ITestNetworkManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ITestNetworkManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ITetheredInterfaceCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ITetheredInterfaceCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ITetheredInterfaceCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/ITetheredInterfaceCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/NattSocketKeepalive$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/NattSocketKeepalive$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/QosCallbackConnection$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/QosCallbackConnection$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/QosCallbackConnection$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/QosCallbackConnection$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/QosFilterParcelable$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/QosFilterParcelable$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/QosFilterParcelable;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/QosFilterParcelable;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/QosSocketFilter;->getNetwork()Landroid/net/Network;,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/QosSocketFilter;->matchesLocalAddress(Ljava/net/InetAddress;II)Z,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/QosSocketFilter;->matchesRemoteAddress(Ljava/net/InetAddress;II)Z,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/TcpSocketKeepalive$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/TcpSocketKeepalive$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/net/mdns/aidl/DiscoveryInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/net/mdns/aidl/DiscoveryInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/net/mdns/aidl/DiscoveryInfo;->describeContents()I,public-api,sdk,system-api,test-api
@@ -3171,6 +3173,25 @@ Landroid/net/connectivity/android/net/mdns/aidl/ResolutionInfo;->equals(Ljava/la
 Landroid/net/connectivity/android/net/mdns/aidl/ResolutionInfo;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/net/mdns/aidl/ResolutionInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/net/mdns/aidl/ResolutionInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/netstats/IUsageCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/netstats/IUsageCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/netstats/IUsageCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/netstats/IUsageCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdManagerCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdManagerCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdManagerCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdManagerCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/util/DnsUtils$Rfc6724Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$1;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$ActiveDataSubscriptionIdListener;->onActiveDataSubscriptionIdChanged(I)V,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$SettingObserver;->onChange(Z)V,public-api,sdk,system-api,test-api
+Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$SettingObserver;->onChange(ZLandroid/net/Uri;)V,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->println()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(I)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(Ljava/lang/String;II)V,core-platform-api,public-api,sdk,system-api,test-api
@@ -3192,10 +3213,6 @@ Landroid/net/connectivity/com/android/net/module/util/IpRange;->equals(Ljava/lan
 Landroid/net/connectivity/com/android/net/module/util/IpRange;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/netstats/IUsageCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/netstats/IUsageCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/netstats/IUsageCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/netstats/IUsageCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/net/netstats/provider/INetworkStatsProvider$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/netstats/provider/INetworkStatsProvider$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/netstats/provider/INetworkStatsProvider$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
@@ -3224,14 +3241,6 @@ Landroid/net/nsd/INsdManager$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-ta
 Landroid/net/nsd/INsdManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/nsd/INsdManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/nsd/INsdManager;,lo-prio,max-target-r
 Landroid/net/nsd/INsdManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/nsd/INsdManagerCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/nsd/INsdManagerCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/nsd/INsdManagerCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/nsd/INsdManagerCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/nsd/INsdServiceConnector$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/nsd/INsdServiceConnector$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/nsd/INsdServiceConnector$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/nsd/INsdServiceConnector$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStarted(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStopped(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
@@ -3280,11 +3289,9 @@ Landroid/net/nsd/NsdManager$ServiceHandler;->handleMessage(Landroid/os/Message;)
 Landroid/net/nsd/NsdManager;-><init>(Landroid/content/Context;Landroid/net/nsd/INsdManager;)V,lo-prio,max-target-o
 Landroid/net/nsd/NsdManager;->ACTION_NSD_STATE_CHANGED:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->DBG:Z,lo-prio,max-target-o
-Landroid/net/nsd/NsdManager;->DISABLE:I,lo-prio,max-target-o
 Landroid/net/nsd/NsdManager;->DISCOVER_SERVICES:I,lo-prio,max-target-o
 Landroid/net/nsd/NsdManager;->DISCOVER_SERVICES_FAILED:I,lo-prio,max-target-o
 Landroid/net/nsd/NsdManager;->DISCOVER_SERVICES_STARTED:I,lo-prio,max-target-o
-Landroid/net/nsd/NsdManager;->ENABLE:I,lo-prio,max-target-o
 Landroid/net/nsd/NsdManager;->EVENT_NAMES:Landroid/util/SparseArray;,lo-prio,max-target-o
 Landroid/net/nsd/NsdManager;->EXTRA_NSD_STATE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdManager;->FAILURE_ALREADY_ACTIVE:I,public-api,sdk,system-api,test-api
@@ -3362,10 +3369,3 @@ Landroid/net/nsd/NsdServiceInfo;->setServiceName(Ljava/lang/String;)V,public-api
 Landroid/net/nsd/NsdServiceInfo;->setServiceType(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/util/DnsUtils$Rfc6724Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/util/MultinetworkPolicyTracker$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/util/MultinetworkPolicyTracker$1;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,sdk,system-api,test-api
-Landroid/net/util/MultinetworkPolicyTracker$ActiveDataSubscriptionIdListener;->onActiveDataSubscriptionIdChanged(I)V,public-api,sdk,system-api,test-api
-Landroid/net/util/MultinetworkPolicyTracker$HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/util/MultinetworkPolicyTracker$SettingObserver;->onChange(Z)V,public-api,sdk,system-api,test-api
-Landroid/net/util/MultinetworkPolicyTracker$SettingObserver;->onChange(ZLandroid/net/Uri;)V,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 711f554..ca7bf01 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -84,8 +84,10 @@ Landroid/nearby/DataElement$1;->newArray(I)[Ljava/lang/Object;,public-api,system
 Landroid/nearby/DataElement;-><init>(I[B)V,system-api,test-api
 Landroid/nearby/DataElement;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
 Landroid/nearby/DataElement;->describeContents()I,public-api,system-api,test-api
+Landroid/nearby/DataElement;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/nearby/DataElement;->getKey()I,system-api,test-api
 Landroid/nearby/DataElement;->getValue()[B,system-api,test-api
+Landroid/nearby/DataElement;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/nearby/DataElement;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/nearby/FastPairDataProviderService;->onBind(Landroid/content/Intent;)Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/nearby/FastPairDevice$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -183,6 +185,7 @@ Landroid/nearby/PresenceDevice$Builder;->setName(Ljava/lang/String;)Landroid/nea
 Landroid/nearby/PresenceDevice$Builder;->setRssi(I)Landroid/nearby/PresenceDevice$Builder;,system-api,test-api
 Landroid/nearby/PresenceDevice;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
 Landroid/nearby/PresenceDevice;->describeContents()I,public-api,system-api,test-api
+Landroid/nearby/PresenceDevice;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/nearby/PresenceDevice;->getDeviceId()Ljava/lang/String;,system-api,test-api
 Landroid/nearby/PresenceDevice;->getDeviceImageUrl()Ljava/lang/String;,system-api,test-api
 Landroid/nearby/PresenceDevice;->getDeviceType()I,system-api,test-api
@@ -191,6 +194,7 @@ Landroid/nearby/PresenceDevice;->getEncryptedIdentity()[B,system-api,test-api
 Landroid/nearby/PresenceDevice;->getExtendedProperties()Ljava/util/List;,system-api,test-api
 Landroid/nearby/PresenceDevice;->getSalt()[B,system-api,test-api
 Landroid/nearby/PresenceDevice;->getSecretId()[B,system-api,test-api
+Landroid/nearby/PresenceDevice;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/nearby/PresenceDevice;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/nearby/PresenceScanFilter$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/nearby/PresenceScanFilter$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
@@ -388,10 +392,6 @@ Landroid/net/CaptivePortalData;->isCaptive()Z,system-api,test-api
 Landroid/net/CaptivePortalData;->isSessionExtendable()Z,system-api,test-api
 Landroid/net/CaptivePortalData;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/CaptivePortalData;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/ConnectionInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/ConnectionInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/ConnectionInfo;->describeContents()I,public-api,system-api,test-api
-Landroid/net/ConnectionInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/ConnectivityDiagnosticsManager$ConnectivityDiagnosticsBinder$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/ConnectivityDiagnosticsManager$ConnectivityDiagnosticsBinder$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/ConnectivityDiagnosticsManager$ConnectivityDiagnosticsBinder$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
@@ -591,7 +591,6 @@ Landroid/net/ConnectivityManager;->unregisterNetworkCallback(Landroid/net/Connec
 Landroid/net/ConnectivityManager;->unregisterNetworkProvider(Landroid/net/NetworkProvider;)V,system-api,test-api
 Landroid/net/ConnectivityManager;->unregisterQosCallback(Landroid/net/QosCallback;)V,system-api,test-api
 Landroid/net/ConnectivityManager;->unregisterTetheringEventCallback(Landroid/net/ConnectivityManager$OnTetheringEventCallback;)V,system-api,test-api
-Landroid/net/ConnectivityResources$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/DataUsageRequest$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/DataUsageRequest$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/DataUsageRequest;->describeContents()I,public-api,system-api,test-api
@@ -747,10 +746,6 @@ Landroid/net/IIpSecService$Default;->asBinder()Landroid/os/IBinder;,public-api,s
 Landroid/net/IIpSecService$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/IIpSecService$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/IIpSecService$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/INetworkActivityListener$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/INetworkActivityListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/INetworkActivityListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/INetworkActivityListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/net/INetworkAgent$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/INetworkAgent$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/INetworkAgent$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
@@ -759,14 +754,6 @@ Landroid/net/INetworkAgentRegistry$Default;->asBinder()Landroid/os/IBinder;,publ
 Landroid/net/INetworkAgentRegistry$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/INetworkAgentRegistry$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/INetworkAgentRegistry$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/INetworkInterfaceOutcomeReceiver$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/INetworkInterfaceOutcomeReceiver$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/INetworkInterfaceOutcomeReceiver$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/INetworkInterfaceOutcomeReceiver$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/INetworkOfferCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/INetworkOfferCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/INetworkOfferCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/INetworkOfferCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/net/INetworkStatsService$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/INetworkStatsService$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/INetworkStatsService$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
@@ -775,26 +762,6 @@ Landroid/net/INetworkStatsSession$Default;->asBinder()Landroid/os/IBinder;,publi
 Landroid/net/INetworkStatsSession$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/INetworkStatsSession$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/INetworkStatsSession$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/IOnCompleteListener$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/IOnCompleteListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/IOnCompleteListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/IOnCompleteListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/IQosCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/IQosCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/IQosCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/IQosCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/ISocketKeepaliveCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/ISocketKeepaliveCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/ISocketKeepaliveCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/ISocketKeepaliveCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/ITestNetworkManager$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/ITestNetworkManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/ITestNetworkManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/ITestNetworkManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/ITetheredInterfaceCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/ITetheredInterfaceCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/ITetheredInterfaceCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/ITetheredInterfaceCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/net/ITetheringConnector$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/ITetheringConnector$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/ITetheringConnector$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
@@ -1071,8 +1038,6 @@ Landroid/net/NattKeepalivePacketData;->describeContents()I,public-api,system-api
 Landroid/net/NattKeepalivePacketData;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/NattKeepalivePacketData;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/NattKeepalivePacketData;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/NattSocketKeepalive$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/NattSocketKeepalive$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/Network$$ExternalSyntheticLambda0;->lookup(Ljava/lang/String;)Ljava/util/List;,core-platform-api
 Landroid/net/Network$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/Network$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
@@ -1511,19 +1476,11 @@ Landroid/net/QosCallback;-><init>()V,system-api,test-api
 Landroid/net/QosCallback;->onError(Landroid/net/QosCallbackException;)V,system-api,test-api
 Landroid/net/QosCallback;->onQosSessionAvailable(Landroid/net/QosSession;Landroid/net/QosSessionAttributes;)V,system-api,test-api
 Landroid/net/QosCallback;->onQosSessionLost(Landroid/net/QosSession;)V,system-api,test-api
-Landroid/net/QosCallbackConnection$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/QosCallbackConnection$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/QosCallbackConnection$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/QosCallbackConnection$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/QosCallbackException;-><init>(Ljava/lang/String;)V,system-api,test-api
 Landroid/net/QosCallbackException;-><init>(Ljava/lang/Throwable;)V,system-api,test-api
 Landroid/net/QosFilter;->getNetwork()Landroid/net/Network;,system-api,test-api
 Landroid/net/QosFilter;->matchesLocalAddress(Ljava/net/InetAddress;II)Z,system-api,test-api
 Landroid/net/QosFilter;->matchesRemoteAddress(Ljava/net/InetAddress;II)Z,system-api,test-api
-Landroid/net/QosFilterParcelable$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/QosFilterParcelable$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/QosFilterParcelable;->describeContents()I,public-api,system-api,test-api
-Landroid/net/QosFilterParcelable;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/QosSession$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/QosSession$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/QosSession;-><init>(II)V,system-api,test-api
@@ -1536,9 +1493,6 @@ Landroid/net/QosSession;->getSessionType()I,system-api,test-api
 Landroid/net/QosSession;->getUniqueId()J,system-api,test-api
 Landroid/net/QosSession;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/QosSession;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/QosSocketFilter;->getNetwork()Landroid/net/Network;,system-api,test-api
-Landroid/net/QosSocketFilter;->matchesLocalAddress(Ljava/net/InetAddress;II)Z,system-api,test-api
-Landroid/net/QosSocketFilter;->matchesRemoteAddress(Ljava/net/InetAddress;II)Z,system-api,test-api
 Landroid/net/QosSocketInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/QosSocketInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/QosSocketInfo;-><init>(Landroid/net/Network;Ljava/net/Socket;)V,system-api,test-api
@@ -1635,8 +1589,6 @@ Landroid/net/TcpKeepalivePacketData;->getTcpWindowScale()I,system-api,test-api
 Landroid/net/TcpKeepalivePacketData;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/TcpKeepalivePacketData;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/TcpKeepalivePacketData;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/TcpSocketKeepalive$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/TcpSocketKeepalive$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/TestNetworkInterface$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/TestNetworkInterface$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/TestNetworkInterface;->describeContents()I,public-api,system-api,test-api
@@ -1869,6 +1821,58 @@ Landroid/net/apf/ApfCapabilities;->hasDataAccess()Z,system-api,test-api
 Landroid/net/apf/ApfCapabilities;->maximumApfProgramSize:I,system-api,test-api
 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/android/net/ConnectionInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ConnectionInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ConnectionInfo;->describeContents()I,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ConnectionInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ConnectivityResources$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkActivityListener$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkActivityListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkActivityListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkActivityListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkInterfaceOutcomeReceiver$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkInterfaceOutcomeReceiver$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkInterfaceOutcomeReceiver$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkInterfaceOutcomeReceiver$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkOfferCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkOfferCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkOfferCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/INetworkOfferCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/IOnCompleteListener$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/IOnCompleteListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/IOnCompleteListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/IOnCompleteListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/IQosCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/IQosCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/IQosCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/IQosCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ISocketKeepaliveCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ISocketKeepaliveCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ISocketKeepaliveCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ISocketKeepaliveCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ITestNetworkManager$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ITestNetworkManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ITestNetworkManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ITestNetworkManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ITetheredInterfaceCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ITetheredInterfaceCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ITetheredInterfaceCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/ITetheredInterfaceCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/NattSocketKeepalive$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/NattSocketKeepalive$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/QosCallbackConnection$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/QosCallbackConnection$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/QosCallbackConnection$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/QosCallbackConnection$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/QosFilterParcelable$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/QosFilterParcelable$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/QosFilterParcelable;->describeContents()I,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/QosFilterParcelable;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/QosSocketFilter;->getNetwork()Landroid/net/Network;,system-api,test-api
+Landroid/net/connectivity/android/net/QosSocketFilter;->matchesLocalAddress(Ljava/net/InetAddress;II)Z,system-api,test-api
+Landroid/net/connectivity/android/net/QosSocketFilter;->matchesRemoteAddress(Ljava/net/InetAddress;II)Z,system-api,test-api
+Landroid/net/connectivity/android/net/TcpSocketKeepalive$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/TcpSocketKeepalive$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/net/mdns/aidl/DiscoveryInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/connectivity/android/net/mdns/aidl/DiscoveryInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/connectivity/android/net/mdns/aidl/DiscoveryInfo;->describeContents()I,public-api,system-api,test-api
@@ -1905,6 +1909,25 @@ Landroid/net/connectivity/android/net/mdns/aidl/ResolutionInfo;->equals(Ljava/la
 Landroid/net/connectivity/android/net/mdns/aidl/ResolutionInfo;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/net/mdns/aidl/ResolutionInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/net/mdns/aidl/ResolutionInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/netstats/IUsageCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/netstats/IUsageCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/netstats/IUsageCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/netstats/IUsageCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdManagerCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdManagerCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdManagerCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdManagerCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/nsd/INsdServiceConnector$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/util/DnsUtils$Rfc6724Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$1;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$ActiveDataSubscriptionIdListener;->onActiveDataSubscriptionIdChanged(I)V,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$SettingObserver;->onChange(Z)V,public-api,system-api,test-api
+Landroid/net/connectivity/android/net/util/MultinetworkPolicyTracker$SettingObserver;->onChange(ZLandroid/net/Uri;)V,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->println()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(I)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/android/util/IndentingPrintWriter;->write(Ljava/lang/String;II)V,core-platform-api,public-api,system-api,test-api
@@ -1926,10 +1949,6 @@ Landroid/net/connectivity/com/android/net/module/util/IpRange;->equals(Ljava/lan
 Landroid/net/connectivity/com/android/net/module/util/IpRange;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/connectivity/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/net/netstats/IUsageCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/netstats/IUsageCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/netstats/IUsageCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/netstats/IUsageCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/net/netstats/provider/INetworkStatsProvider$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/netstats/provider/INetworkStatsProvider$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/netstats/provider/INetworkStatsProvider$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
@@ -1952,14 +1971,6 @@ Landroid/net/nsd/INsdManager$Default;->asBinder()Landroid/os/IBinder;,public-api
 Landroid/net/nsd/INsdManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/nsd/INsdManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/nsd/INsdManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/nsd/INsdManagerCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/nsd/INsdManagerCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/nsd/INsdManagerCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/nsd/INsdManagerCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/nsd/INsdServiceConnector$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/nsd/INsdServiceConnector$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/nsd/INsdServiceConnector$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/nsd/INsdServiceConnector$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$$ExternalSyntheticLambda0;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStarted(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdManager$DiscoveryListener;->onDiscoveryStopped(Ljava/lang/String;)V,public-api,system-api,test-api
@@ -2042,10 +2053,3 @@ Landroid/net/nsd/NsdServiceInfo;->setServiceName(Ljava/lang/String;)V,public-api
 Landroid/net/nsd/NsdServiceInfo;->setServiceType(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/nsd/NsdServiceInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/util/DnsUtils$Rfc6724Comparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,system-api,test-api
-Landroid/net/util/MultinetworkPolicyTracker$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/util/MultinetworkPolicyTracker$1;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V,public-api,system-api,test-api
-Landroid/net/util/MultinetworkPolicyTracker$ActiveDataSubscriptionIdListener;->onActiveDataSubscriptionIdChanged(I)V,public-api,system-api,test-api
-Landroid/net/util/MultinetworkPolicyTracker$HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/util/MultinetworkPolicyTracker$SettingObserver;->onChange(Z)V,public-api,system-api,test-api
-Landroid/net/util/MultinetworkPolicyTracker$SettingObserver;->onChange(ZLandroid/net/Uri;)V,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 2138e08..299bde6 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -1,10 +1,10 @@
 signature,file,startline,startcol,endline,endcol,properties
-Landroid/app/usage/NetworkStatsManager;->setPollForce(Z)V,packages/modules/Connectivity/framework-t/src/android/app/usage/NetworkStatsManager.java,199,5,199,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2195,9,2195,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2121,9,2121,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2125,9,2125,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2128,9,2128,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2131,9,2131,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/app/usage/NetworkStatsManager;->setPollForce(Z)V,packages/modules/Connectivity/framework-t/src/android/app/usage/NetworkStatsManager.java,203,5,203,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2209,9,2209,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2135,9,2135,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2139,9,2139,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2142,9,2142,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2145,9,2145,92,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/ConnectivityManager;->INET_CONDITION_ACTION:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,356,5,356,25,
 Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,371,5,371,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,380,5,380,88,maxTargetSdk=30&trackingBug=170729553L
@@ -16,44 +16,44 @@ Landroid/net/ConnectivityManager;->TYPE_MOBILE_CBS:I,packages/modules/Connectivi
 Landroid/net/ConnectivityManager;->TYPE_MOBILE_IA:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,705,5,705,25,
 Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,715,5,715,88,maxTargetSdk=28&trackingBug=130143562L
 Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,941,5,941,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->getNetworkTypeName(I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1110,5,1110,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1177,5,1177,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1461,5,1461,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1583,5,1583,25,
-Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1621,5,1621,25,
-Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1645,5,1645,88,maxTargetSdk=28&trackingBug=109783091L
-Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1670,5,1670,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1907,5,1907,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1993,5,1993,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2022,5,2022,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2052,5,2052,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,2276,5,2276,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2457,5,2457,25,
-Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2511,5,2511,25,
-Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2521,5,2521,25,
-Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2633,5,2633,25,
-Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2678,5,2678,25,
-Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2696,5,2696,25,
-Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2711,5,2711,25,
-Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2732,5,2732,25,
-Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2776,5,2776,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2800,5,2800,25,
-Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3038,5,3038,25,
-Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3056,5,3056,25,
-Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3075,5,3075,25,
-Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3099,5,3099,25,
-Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3215,5,3215,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3465,5,3465,88,maxTargetSdk=28&trackingBug=130143562L
-Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5259,5,5259,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager$Listener;->onAvailabilityChanged(Ljava/lang/String;Z)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,167,9,167,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->getConfiguration(Ljava/lang/String;)Landroid/net/IpConfiguration;,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,194,5,194,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->setConfiguration(Ljava/lang/String;Landroid/net/IpConfiguration;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,207,5,207,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->isAvailable()Z,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,220,5,220,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->isAvailable(Ljava/lang/String;)Z,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,231,5,231,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->addListener(Landroid/net/EthernetManager$Listener;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,248,5,248,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->addListener(Landroid/net/EthernetManager$Listener;Ljava/util/concurrent/Executor;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,262,5,262,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->getAvailableInterfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,321,5,321,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/EthernetManager;->removeListener(Landroid/net/EthernetManager$Listener;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,361,5,361,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->getNetworkTypeName(I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1129,5,1129,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1196,5,1196,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->getActiveNetworkInfoForUid(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1479,5,1479,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->getNetworkForType(I)Landroid/net/Network;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1598,5,1598,25,
+Landroid/net/ConnectivityManager;->getDefaultNetworkCapabilitiesForUser(I)[Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1635,5,1635,25,
+Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1659,5,1659,88,maxTargetSdk=28&trackingBug=109783091L
+Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1684,5,1684,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->networkCapabilitiesForFeature(ILjava/lang/String;)Landroid/net/NetworkCapabilities;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,1921,5,1921,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->sLegacyRequests:Ljava/util/HashMap;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2007,5,2007,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestNetworkForFeatureLocked(Landroid/net/NetworkCapabilities;)Landroid/net/NetworkRequest;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2036,5,2036,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->removeRequestForFeature(Landroid/net/NetworkCapabilities;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2066,5,2066,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,2290,5,2290,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2470,5,2470,25,
+Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2524,5,2524,25,
+Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2534,5,2534,25,
+Landroid/net/ConnectivityManager;->from(Landroid/content/Context;)Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2661,5,2661,25,
+Landroid/net/ConnectivityManager;->getInstance()Landroid/net/ConnectivityManager;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2706,5,2706,25,
+Landroid/net/ConnectivityManager;->getTetherableIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2724,5,2724,25,
+Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2739,5,2739,25,
+Landroid/net/ConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2760,5,2760,25,
+Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2804,5,2804,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,2828,5,2828,25,
+Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3066,5,3066,25,
+Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3084,5,3084,25,
+Landroid/net/ConnectivityManager;->getTetherableBluetoothRegexs()[Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3103,5,3103,25,
+Landroid/net/ConnectivityManager;->setUsbTethering(Z)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3127,5,3127,25,
+Landroid/net/ConnectivityManager;->getLastTetherError(Ljava/lang/String;)I,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3243,5,3243,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,3492,5,3492,88,maxTargetSdk=28&trackingBug=130143562L
+Landroid/net/ConnectivityManager;->setProcessDefaultNetworkForHostResolution(Landroid/net/Network;)Z,packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java,5285,5,5285,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager$Listener;->onAvailabilityChanged(Ljava/lang/String;Z)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,165,9,165,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->getConfiguration(Ljava/lang/String;)Landroid/net/IpConfiguration;,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,192,5,192,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->setConfiguration(Ljava/lang/String;Landroid/net/IpConfiguration;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,205,5,205,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->isAvailable()Z,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,218,5,218,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->isAvailable(Ljava/lang/String;)Z,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,229,5,229,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->addListener(Landroid/net/EthernetManager$Listener;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,246,5,246,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->addListener(Landroid/net/EthernetManager$Listener;Ljava/util/concurrent/Executor;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,260,5,260,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->getAvailableInterfaces()[Ljava/lang/String;,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,319,5,319,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/EthernetManager;->removeListener(Landroid/net/EthernetManager$Listener;)V,packages/modules/Connectivity/framework-t/src/android/net/EthernetManager.java,359,5,359,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/IConnectivityManager;->getActiveNetworkInfo()Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/IConnectivityManager.aidl,60,1,60,25,
 Landroid/net/IConnectivityManager;->getNetworkInfo(I)Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/IConnectivityManager.aidl,63,1,63,44,maxTargetSdk=28
 Landroid/net/IConnectivityManager;->getAllNetworkInfo()[Landroid/net/NetworkInfo;,packages/modules/Connectivity/framework/src/android/net/IConnectivityManager.aidl,66,1,66,25,
@@ -82,24 +82,24 @@ Landroid/net/LinkAddress;->address:Ljava/net/InetAddress;,packages/modules/Conne
 Landroid/net/LinkAddress;->prefixLength:I,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,87,5,87,88,maxTargetSdk=28&trackingBug=115609023L
 Landroid/net/LinkAddress;->isIPv6()Z,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,172,5,172,63,maxTargetSdk=28
 Landroid/net/LinkAddress;->getNetworkPrefixLength()I,packages/modules/Connectivity/framework/src/android/net/LinkAddress.java,412,5,412,25,
-Landroid/net/LinkProperties;->mIfaceName:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,72,5,72,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/LinkProperties;->compareProvisioning(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Landroid/net/LinkProperties$ProvisioningChange;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,132,5,132,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/LinkProperties;->getAllAddresses()Ljava/util/List;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,281,5,281,25,
-Landroid/net/LinkProperties;->addStackedLink(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,860,5,860,25,
-Landroid/net/LinkProperties;->getStackedLinks()Ljava/util/List;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,888,5,888,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/LinkProperties;->hasIPv4Address()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1060,5,1060,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->hasGlobalIPv6Address()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1115,5,1115,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->hasIPv4DefaultRoute()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1158,5,1158,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->hasIPv6DefaultRoute()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1186,5,1186,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->hasIPv4DnsServer()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1214,5,1214,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->hasIPv6DnsServer()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1242,5,1242,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->isIPv6Provisioned()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1312,5,1312,63,maxTargetSdk=28
-Landroid/net/LinkProperties;->isIdenticalInterfaceName(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1390,5,1390,25,
-Landroid/net/LinkProperties;->isIdenticalAddresses(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1413,5,1413,25,
-Landroid/net/LinkProperties;->isIdenticalDnses(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1425,5,1425,25,
-Landroid/net/LinkProperties;->isIdenticalRoutes(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1478,5,1478,25,
-Landroid/net/LinkProperties;->isIdenticalHttpProxy(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1490,5,1490,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/LinkProperties;->isIdenticalStackedLinks(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1502,5,1502,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/LinkProperties;->mIfaceName:Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,73,5,73,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/LinkProperties;->compareProvisioning(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Landroid/net/LinkProperties$ProvisioningChange;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,133,5,133,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/LinkProperties;->getAllAddresses()Ljava/util/List;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,282,5,282,25,
+Landroid/net/LinkProperties;->addStackedLink(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,865,5,865,25,
+Landroid/net/LinkProperties;->getStackedLinks()Ljava/util/List;,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,893,5,893,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/LinkProperties;->hasIPv4Address()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1065,5,1065,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->hasGlobalIPv6Address()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1120,5,1120,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->hasIPv4DefaultRoute()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1163,5,1163,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->hasIPv6DefaultRoute()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1191,5,1191,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->hasIPv4DnsServer()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1219,5,1219,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->hasIPv6DnsServer()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1247,5,1247,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->isIPv6Provisioned()Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1317,5,1317,63,maxTargetSdk=28
+Landroid/net/LinkProperties;->isIdenticalInterfaceName(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1395,5,1395,25,
+Landroid/net/LinkProperties;->isIdenticalAddresses(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1418,5,1418,25,
+Landroid/net/LinkProperties;->isIdenticalDnses(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1430,5,1430,25,
+Landroid/net/LinkProperties;->isIdenticalRoutes(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1483,5,1483,25,
+Landroid/net/LinkProperties;->isIdenticalHttpProxy(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1495,5,1495,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/LinkProperties;->isIdenticalStackedLinks(Landroid/net/LinkProperties;)Z,packages/modules/Connectivity/framework/src/android/net/LinkProperties.java,1507,5,1507,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/MacAddress;->ALL_ZEROS_ADDRESS:Landroid/net/MacAddress;,packages/modules/Connectivity/framework/src/android/net/MacAddress.java,62,5,62,88,maxTargetSdk=30&trackingBug=170729553L
 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
@@ -143,31 +143,31 @@ Landroid/net/NetworkStats;->rxPackets:[J,packages/modules/Connectivity/framework
 Landroid/net/NetworkStats;->txBytes:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,237,5,237,25,
 Landroid/net/NetworkStats;->txPackets:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,239,5,239,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkStats;->operations:[J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,241,5,241,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats;-><init>(Landroid/os/Parcel;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,533,5,533,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStats;->getValues(ILandroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,708,5,708,25,
-Landroid/net/NetworkStats;->size()I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,766,5,766,25,
-Landroid/net/NetworkStats;->getUniqueUids()[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,936,5,936,25,
-Landroid/net/NetworkStats;->getTotalBytes()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,956,5,956,25,
-Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,966,5,966,25,
-Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;I)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,976,5,976,25,
-Landroid/net/NetworkStats;->getTotalIncludingTags(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,991,5,991,25,
-Landroid/net/NetworkStatsHistory$Entry;->bucketDuration:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,131,9,131,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory$Entry;->bucketStart:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,134,9,134,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory$Entry;->rxBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,139,9,139,29,
-Landroid/net/NetworkStatsHistory$Entry;->rxPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,142,9,142,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory$Entry;->txBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,145,9,145,29,
-Landroid/net/NetworkStatsHistory$Entry;->txPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,148,9,148,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory;-><init>(J)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,282,5,282,25,
-Landroid/net/NetworkStatsHistory;-><init>(Landroid/os/Parcel;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,313,5,313,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory;->size()I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,402,5,402,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory;->getStart()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,413,5,413,25,
-Landroid/net/NetworkStatsHistory;->getEnd()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,423,5,423,25,
-Landroid/net/NetworkStatsHistory;->getIndexBefore(J)I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,445,5,445,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory;->getValues(ILandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,475,5,475,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkStatsHistory;->recordEntireHistory(Landroid/net/NetworkStatsHistory;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,601,5,601,25,
-Landroid/net/NetworkStatsHistory;->getValues(JJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,753,5,753,25,
-Landroid/net/NetworkStatsHistory;->getValues(JJJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,768,5,768,25,
-Landroid/net/NetworkStatsHistory;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,995,5,995,25,
+Landroid/net/NetworkStats;-><init>(Landroid/os/Parcel;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,521,5,521,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStats;->getValues(ILandroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,698,5,698,25,
+Landroid/net/NetworkStats;->size()I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,756,5,756,25,
+Landroid/net/NetworkStats;->getUniqueUids()[I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,927,5,927,25,
+Landroid/net/NetworkStats;->getTotalBytes()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,947,5,947,25,
+Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,957,5,957,25,
+Landroid/net/NetworkStats;->getTotal(Landroid/net/NetworkStats$Entry;I)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,967,5,967,25,
+Landroid/net/NetworkStats;->getTotalIncludingTags(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStats.java,982,5,982,25,
+Landroid/net/NetworkStatsHistory$Entry;->bucketDuration:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,134,9,134,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory$Entry;->bucketStart:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,137,9,137,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory$Entry;->rxBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,142,9,142,29,
+Landroid/net/NetworkStatsHistory$Entry;->rxPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,145,9,145,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory$Entry;->txBytes:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,148,9,148,29,
+Landroid/net/NetworkStatsHistory$Entry;->txPackets:J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,151,9,151,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory;-><init>(J)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,285,5,285,25,
+Landroid/net/NetworkStatsHistory;-><init>(Landroid/os/Parcel;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,316,5,316,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory;->size()I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,405,5,405,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory;->getStart()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,416,5,416,25,
+Landroid/net/NetworkStatsHistory;->getEnd()J,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,426,5,426,25,
+Landroid/net/NetworkStatsHistory;->getIndexBefore(J)I,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,448,5,448,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory;->getValues(ILandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,478,5,478,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkStatsHistory;->recordEntireHistory(Landroid/net/NetworkStatsHistory;)V,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,605,5,605,25,
+Landroid/net/NetworkStatsHistory;->getValues(JJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,758,5,758,25,
+Landroid/net/NetworkStatsHistory;->getValues(JJJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,773,5,773,25,
+Landroid/net/NetworkStatsHistory;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Connectivity/framework-t/src/android/net/NetworkStatsHistory.java,1001,5,1001,25,
 Landroid/net/NetworkTemplate;->buildTemplateMobileAll(Ljava/lang/String;)Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,192,5,192,25,
 Landroid/net/NetworkTemplate;->buildTemplateMobileWildcard()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,225,5,225,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkTemplate;->buildTemplateWifiWildcard()Landroid/net/NetworkTemplate;,packages/modules/Connectivity/framework-t/src/android/net/NetworkTemplate.java,236,5,236,25,
diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
index 740c684..ca60d25 100644
--- a/current/hiddenapi/signature-patterns.csv
+++ b/current/hiddenapi/signature-patterns.csv
@@ -34,19 +34,16 @@ android/nearby/ScanRequest
 android/nearby/aidl/**
 android/net/CaptivePortal
 android/net/CaptivePortalData
-android/net/ConnectionInfo
 android/net/ConnectivityDiagnosticsManager
 android/net/ConnectivityFrameworkInitializer
 android/net/ConnectivityFrameworkInitializerTiramisu
 android/net/ConnectivityManager
-android/net/ConnectivityResources
 android/net/ConnectivitySettingsManager
 android/net/ConnectivityThread
 android/net/DataUsageRequest
 android/net/DhcpInfo
 android/net/DhcpOption
 android/net/DnsResolver
-android/net/DnsResolverServiceManager
 android/net/DscpPolicy
 android/net/EthernetManager
 android/net/EthernetNetworkManagementException
@@ -59,18 +56,10 @@ android/net/IEthernetManager
 android/net/IEthernetServiceListener
 android/net/IIntResultListener
 android/net/IIpSecService
-android/net/INetworkActivityListener
 android/net/INetworkAgent
 android/net/INetworkAgentRegistry
-android/net/INetworkInterfaceOutcomeReceiver
-android/net/INetworkOfferCallback
 android/net/INetworkStatsService
 android/net/INetworkStatsSession
-android/net/IOnCompleteListener
-android/net/IQosCallback
-android/net/ISocketKeepaliveCallback
-android/net/ITestNetworkManager
-android/net/ITetheredInterfaceCallback
 android/net/ITetheringConnector
 android/net/ITetheringEventCallback
 android/net/InetAddresses
@@ -90,14 +79,12 @@ android/net/LinkAddress
 android/net/LinkProperties
 android/net/MacAddress
 android/net/NattKeepalivePacketData
-android/net/NattSocketKeepalive
 android/net/Network
 android/net/NetworkAgent
 android/net/NetworkAgentConfig
 android/net/NetworkCapabilities
 android/net/NetworkConfig
 android/net/NetworkIdentity
-android/net/NetworkIdentitySet
 android/net/NetworkInfo
 android/net/NetworkProvider
 android/net/NetworkReleasedException
@@ -106,7 +93,6 @@ android/net/NetworkScore
 android/net/NetworkState
 android/net/NetworkStateSnapshot
 android/net/NetworkStats
-android/net/NetworkStatsAccess
 android/net/NetworkStatsCollection
 android/net/NetworkStatsHistory
 android/net/NetworkTemplate
@@ -116,12 +102,9 @@ android/net/ParseException
 android/net/ProfileNetworkPreference
 android/net/ProxyInfo
 android/net/QosCallback
-android/net/QosCallbackConnection
 android/net/QosCallbackException
 android/net/QosFilter
-android/net/QosFilterParcelable
 android/net/QosSession
-android/net/QosSocketFilter
 android/net/QosSocketInfo
 android/net/RouteInfo
 android/net/SocketKeepalive
@@ -129,8 +112,6 @@ android/net/SocketLocalAddressChangedException
 android/net/SocketNotBoundException
 android/net/StaticIpConfiguration
 android/net/TcpKeepalivePacketData
-android/net/TcpRepairWindow
-android/net/TcpSocketKeepalive
 android/net/TestNetworkInterface
 android/net/TestNetworkManager
 android/net/TestNetworkSpecifier
@@ -149,9 +130,6 @@ android/net/UnderlyingNetworkInfo
 android/net/VpnTransportInfo
 android/net/apf/**
 android/net/connectivity/**
-android/net/netstats/IUsageCallback
 android/net/netstats/provider/**
 android/net/nsd/**
-android/net/util/DnsUtils
 android/net/util/KeepaliveUtils
-android/net/util/MultinetworkPolicyTracker
diff --git a/current/sdk_library/module-lib/framework-connectivity-stubs.jar b/current/sdk_library/module-lib/framework-connectivity-stubs.jar
index d466546..25c5442 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-t-stubs.jar b/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
index 8af709e..6aef73a 100644
--- a/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
+++ b/current/sdk_library/module-lib/framework-connectivity-t-stubs.jar
diff --git a/current/sdk_library/module-lib/framework-connectivity-t.srcjar b/current/sdk_library/module-lib/framework-connectivity-t.srcjar
index 6b0ee85..c54bca9 100644
--- a/current/sdk_library/module-lib/framework-connectivity-t.srcjar
+++ b/current/sdk_library/module-lib/framework-connectivity-t.srcjar
diff --git a/current/sdk_library/module-lib/framework-connectivity.srcjar b/current/sdk_library/module-lib/framework-connectivity.srcjar
index 714f1b0..132d391 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.txt b/current/sdk_library/module-lib/framework-connectivity.txt
index ddac19d..a2a1ac0 100644
--- a/current/sdk_library/module-lib/framework-connectivity.txt
+++ b/current/sdk_library/module-lib/framework-connectivity.txt
@@ -51,6 +51,9 @@ package android.net {
     field public static final int BLOCKED_REASON_RESTRICTED_MODE = 8; // 0x8
     field public static final int FIREWALL_CHAIN_DOZABLE = 1; // 0x1
     field public static final int FIREWALL_CHAIN_LOW_POWER_STANDBY = 5; // 0x5
+    field public static final int FIREWALL_CHAIN_OEM_DENY_1 = 7; // 0x7
+    field public static final int FIREWALL_CHAIN_OEM_DENY_2 = 8; // 0x8
+    field public static final int FIREWALL_CHAIN_OEM_DENY_3 = 9; // 0x9
     field public static final int FIREWALL_CHAIN_POWERSAVE = 3; // 0x3
     field public static final int FIREWALL_CHAIN_RESTRICTED = 4; // 0x4
     field public static final int FIREWALL_CHAIN_STANDBY = 2; // 0x2
@@ -197,6 +200,8 @@ package android.net {
     method public int describeContents();
     method @NonNull public android.os.ParcelFileDescriptor getFileDescriptor();
     method @NonNull public String getInterfaceName();
+    method @Nullable public android.net.MacAddress getMacAddress();
+    method public int getMtu();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.TestNetworkInterface> CREATOR;
   }
diff --git a/current/sdk_library/module-lib/framework-connectivity_annotations.zip b/current/sdk_library/module-lib/framework-connectivity_annotations.zip
index f178913..f21fc03 100644
--- a/current/sdk_library/module-lib/framework-connectivity_annotations.zip
+++ b/current/sdk_library/module-lib/framework-connectivity_annotations.zip
diff --git a/current/sdk_library/public/framework-connectivity-stubs.jar b/current/sdk_library/public/framework-connectivity-stubs.jar
index 61c43dd..ad6e442 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-t.srcjar b/current/sdk_library/public/framework-connectivity-t.srcjar
index 95abdcb..b53beee 100644
--- a/current/sdk_library/public/framework-connectivity-t.srcjar
+++ b/current/sdk_library/public/framework-connectivity-t.srcjar
diff --git a/current/sdk_library/public/framework-connectivity.srcjar b/current/sdk_library/public/framework-connectivity.srcjar
index 14c0e2f..40cd726 100644
--- a/current/sdk_library/public/framework-connectivity.srcjar
+++ b/current/sdk_library/public/framework-connectivity.srcjar
diff --git a/current/sdk_library/system/framework-connectivity-stubs.jar b/current/sdk_library/system/framework-connectivity-stubs.jar
index e5ef1e9..14c74ea 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-t-stubs.jar b/current/sdk_library/system/framework-connectivity-t-stubs.jar
index 7dd6e16..34cbd79 100644
--- a/current/sdk_library/system/framework-connectivity-t-stubs.jar
+++ b/current/sdk_library/system/framework-connectivity-t-stubs.jar
diff --git a/current/sdk_library/system/framework-connectivity-t.srcjar b/current/sdk_library/system/framework-connectivity-t.srcjar
index f4b759d..924e351 100644
--- a/current/sdk_library/system/framework-connectivity-t.srcjar
+++ b/current/sdk_library/system/framework-connectivity-t.srcjar
diff --git a/current/sdk_library/system/framework-connectivity.srcjar b/current/sdk_library/system/framework-connectivity.srcjar
index d620d13..e3a906e 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 db1d7e9..f1298ce 100644
--- a/current/sdk_library/system/framework-connectivity.txt
+++ b/current/sdk_library/system/framework-connectivity.txt
@@ -249,10 +249,10 @@ package android.net {
     method public void onValidationStatus(int, @Nullable android.net.Uri);
     method @NonNull public android.net.Network register();
     method public void sendAddDscpPolicy(@NonNull android.net.DscpPolicy);
-    method public final void sendLinkProperties(@NonNull android.net.LinkProperties);
-    method public final void sendNetworkCapabilities(@NonNull android.net.NetworkCapabilities);
-    method public final void sendNetworkScore(@NonNull android.net.NetworkScore);
-    method public final void sendNetworkScore(@IntRange(from=0, to=99) int);
+    method public void sendLinkProperties(@NonNull android.net.LinkProperties);
+    method public void sendNetworkCapabilities(@NonNull android.net.NetworkCapabilities);
+    method public void sendNetworkScore(@NonNull android.net.NetworkScore);
+    method public void sendNetworkScore(@IntRange(from=0, to=99) int);
     method public final void sendQosCallbackError(int, int);
     method public final void sendQosSessionAvailable(int, int, @NonNull android.net.QosSessionAttributes);
     method public final void sendQosSessionLost(int, int, int);
@@ -262,7 +262,7 @@ package android.net {
     method @Deprecated public void setLegacySubtype(int, @NonNull String);
     method public void setLingerDuration(@NonNull java.time.Duration);
     method public void setTeardownDelayMillis(@IntRange(from=0, to=0x1388) int);
-    method public final void setUnderlyingNetworks(@Nullable java.util.List<android.net.Network>);
+    method public void setUnderlyingNetworks(@Nullable java.util.List<android.net.Network>);
     method public void unregister();
     method public void unregisterAfterReplacement(@IntRange(from=0, to=0x1388) int);
     field public static final int DSCP_POLICY_STATUS_DELETED = 4; // 0x4
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 52c16eb..5d55c6d 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8762350
\ No newline at end of file
+8953304
\ No newline at end of file