Snap for 7921329 from d925c062e5549cfda7435acba399ed035f3581f5 to sc-v2-release

Change-Id: I99106c1524540074ed2d1905dc833750b12f4624

5 files changed, 219 insertions, 7 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index b844f40..c71b02d 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: "7542407"
+    build_id: "7727475"
     target: "mainline_modules-user"
     source_file: "mainline-sdks/tethering-module-sdk-current.zip"
   }
@@ -8,6 +8,12 @@ drops {
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/Connectivity"
-  git_branch: "sc-dev"
+  git_branch: "sc-v2-dev"
   transform: TRANSFORM_UNZIP
+  transform_options {
+    rename {
+      from_path: "Android.bp"
+      to_path: "Android.bp.auto"
+    }
+  }
 }
diff --git a/current/Android.bp.auto b/current/Android.bp.auto
new file mode 100755
index 0000000..c8ecddf
--- /dev/null
+++ b/current/Android.bp.auto
@@ -0,0 +1,198 @@
+// This is auto-generated. DO NOT EDIT.
+
+package {
+    // A default list here prevents the license LSC from adding its own list which would
+    // be unnecessary as every module in the sdk already has its own licenses property.
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+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-tethering@current",
+    ],
+    hidden_api: {
+        unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
+        max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
+        stub_flags: "hiddenapi/stub-flags.csv",
+        annotation_flags: "hiddenapi/annotation-flags.csv",
+        metadata: "hiddenapi/metadata.csv",
+        index: "hiddenapi/index.csv",
+        all_flags: "hiddenapi/all-flags.csv",
+    },
+}
+
+prebuilt_bootclasspath_fragment {
+    name: "com.android.tethering-bootclasspath-fragment",
+    prefer: false,
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.tethering"],
+    licenses: ["tethering-module-sdk_Android-Apache-2.0"],
+    contents: [
+        "framework-connectivity",
+        "framework-tethering",
+    ],
+    hidden_api: {
+        unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
+        max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
+        stub_flags: "hiddenapi/stub-flags.csv",
+        annotation_flags: "hiddenapi/annotation-flags.csv",
+        metadata: "hiddenapi/metadata.csv",
+        index: "hiddenapi/index.csv",
+        all_flags: "hiddenapi/all-flags.csv",
+    },
+}
+
+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",
+        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",
+        sdk_version: "module_current",
+    },
+    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",
+        sdk_version: "module_current",
+    },
+}
+
+java_sdk_library_import {
+    name: "framework-connectivity",
+    prefer: false,
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.tethering"],
+    licenses: ["tethering-module-sdk_Android-Apache-2.0"],
+    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",
+        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",
+        sdk_version: "module_current",
+    },
+    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",
+        sdk_version: "module_current",
+    },
+}
+
+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",
+        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",
+        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",
+        sdk_version: "module_current",
+    },
+}
+
+java_sdk_library_import {
+    name: "framework-tethering",
+    prefer: false,
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.tethering"],
+    licenses: ["tethering-module-sdk_Android-Apache-2.0"],
+    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",
+        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",
+        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",
+        sdk_version: "module_current",
+    },
+}
+
+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"],
+    license_text: ["licenses/build/soong/licenses/LICENSE"],
+}
+
+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-tethering@current",
+    ],
+}
diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index b997155..c00a152 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv
@@ -2582,6 +2582,7 @@ Landroid/net/NetworkCapabilities;->removeDefaultCapabilites()Landroid/net/Networ
 Landroid/net/NetworkCapabilities;->removeForbiddenCapability(I)Landroid/net/NetworkCapabilities;,blocked
 Landroid/net/NetworkCapabilities;->removeTransportType(I)Landroid/net/NetworkCapabilities;,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->restrictCapabilitesForTestNetwork(I)V,blocked
+Landroid/net/NetworkCapabilities;->restrictCapabilitiesForTestNetwork(I)V,blocked
 Landroid/net/NetworkCapabilities;->satisfiedByImmutableNetworkCapabilities(Landroid/net/NetworkCapabilities;)Z,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->satisfiedByLinkBandwidths(Landroid/net/NetworkCapabilities;)Z,lo-prio,max-target-o
 Landroid/net/NetworkCapabilities;->satisfiedByNetCapabilities(Landroid/net/NetworkCapabilities;Z)Z,lo-prio,max-target-o
@@ -3907,6 +3908,7 @@ Landroid/net/connectivity/framework/util/CollectionUtils;->any(Landroid/util/Spa
 Landroid/net/connectivity/framework/util/CollectionUtils;->any(Ljava/util/Collection;Ljava/util/function/Predicate;)Z,blocked
 Landroid/net/connectivity/framework/util/CollectionUtils;->contains([II)Z,blocked
 Landroid/net/connectivity/framework/util/CollectionUtils;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z,blocked
+Landroid/net/connectivity/framework/util/CollectionUtils;->contains([SS)Z,blocked
 Landroid/net/connectivity/framework/util/CollectionUtils;->filter(Ljava/util/Collection;Ljava/util/function/Predicate;)Ljava/util/ArrayList;,blocked
 Landroid/net/connectivity/framework/util/CollectionUtils;->indexOf(Ljava/util/Collection;Ljava/util/function/Predicate;)I,blocked
 Landroid/net/connectivity/framework/util/CollectionUtils;->indexOf([Ljava/lang/Object;Ljava/lang/Object;)I,blocked
@@ -4117,7 +4119,6 @@ Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->NET_CAPABILI
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VEHICLE_INTERNAL:I,blocked
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VSIM:I,blocked
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->RESTRICTED_CAPABILITIES:J,blocked
-Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->TRANSPORT_USB:I,blocked
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->UNRESTRICTED_CAPABILITIES:J,blocked
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->getDisplayTransport([I)I,blocked
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->inferRestrictedCapability(Landroid/net/NetworkCapabilities;)Z,blocked
@@ -4151,6 +4152,7 @@ Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_CHECKSUM
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ECHO_REPLY_TYPE:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ECHO_REQUEST_TYPE:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_HEADER_MIN_LEN:I,blocked
+Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NA_HEADER_LEN:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_LENGTH_SCALING_FACTOR:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MIN_LENGTH:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MTU:I,blocked
@@ -4161,9 +4163,11 @@ Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTIO
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_TLLA:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_ADVERTISEMENT:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_SOLICITATION:I,blocked
+Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NS_HEADER_LEN:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_RA_HEADER_LEN:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ROUTER_ADVERTISEMENT:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ROUTER_SOLICITATION:I,blocked
+Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_RS_HEADER_LEN:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->INFINITE_LEASE:I,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->IPV4_ADDR_ALL:Ljava/net/Inet4Address;,blocked
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->IPV4_ADDR_ANY:Ljava/net/Inet4Address;,blocked
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index c773a97..0f3ae5e 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -85,9 +85,9 @@ Landroid/net/Network;->netId:I,packages/modules/Connectivity/framework/src/andro
 Landroid/net/Network;-><init>(I)V,packages/modules/Connectivity/framework/src/android/net/Network.java,115,5,115,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkAgent;->sendNetworkInfo(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkAgent.java,946,5,946,88,maxTargetSdk=28&trackingBug=115609023L
 Landroid/net/NetworkCapabilities;->mNetworkCapabilities:J,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,222,5,222,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1439,5,1439,63,maxTargetSdk=28
-Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1465,5,1465,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2148,5,2148,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->mSignalStrength:I,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1452,5,1452,63,maxTargetSdk=28
+Landroid/net/NetworkCapabilities;->hasSignalStrength()Z,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,1478,5,1478,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String;,packages/modules/Connectivity/framework/src/android/net/NetworkCapabilities.java,2161,5,2161,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/NetworkInfo;-><init>(Landroid/net/NetworkInfo;)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,181,5,181,25,
 Landroid/net/NetworkInfo;->setSubtype(ILjava/lang/String;)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,250,5,250,25,
 Landroid/net/NetworkInfo;->setIsAvailable(Z)V,packages/modules/Connectivity/framework/src/android/net/NetworkInfo.java,369,5,369,25,
diff --git a/current/hiddenapi/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index be4e029..e066f5e 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv
@@ -2582,6 +2582,7 @@ Landroid/net/NetworkCapabilities;->removeDefaultCapabilites()Landroid/net/Networ
 Landroid/net/NetworkCapabilities;->removeForbiddenCapability(I)Landroid/net/NetworkCapabilities;
 Landroid/net/NetworkCapabilities;->removeTransportType(I)Landroid/net/NetworkCapabilities;
 Landroid/net/NetworkCapabilities;->restrictCapabilitesForTestNetwork(I)V
+Landroid/net/NetworkCapabilities;->restrictCapabilitiesForTestNetwork(I)V
 Landroid/net/NetworkCapabilities;->satisfiedByImmutableNetworkCapabilities(Landroid/net/NetworkCapabilities;)Z
 Landroid/net/NetworkCapabilities;->satisfiedByLinkBandwidths(Landroid/net/NetworkCapabilities;)Z
 Landroid/net/NetworkCapabilities;->satisfiedByNetCapabilities(Landroid/net/NetworkCapabilities;Z)Z
@@ -3907,6 +3908,7 @@ Landroid/net/connectivity/framework/util/CollectionUtils;->any(Landroid/util/Spa
 Landroid/net/connectivity/framework/util/CollectionUtils;->any(Ljava/util/Collection;Ljava/util/function/Predicate;)Z
 Landroid/net/connectivity/framework/util/CollectionUtils;->contains([II)Z
 Landroid/net/connectivity/framework/util/CollectionUtils;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z
+Landroid/net/connectivity/framework/util/CollectionUtils;->contains([SS)Z
 Landroid/net/connectivity/framework/util/CollectionUtils;->filter(Ljava/util/Collection;Ljava/util/function/Predicate;)Ljava/util/ArrayList;
 Landroid/net/connectivity/framework/util/CollectionUtils;->indexOf(Ljava/util/Collection;Ljava/util/function/Predicate;)I
 Landroid/net/connectivity/framework/util/CollectionUtils;->indexOf([Ljava/lang/Object;Ljava/lang/Object;)I
@@ -4117,7 +4119,6 @@ Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->NET_CAPABILI
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VEHICLE_INTERNAL:I
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VSIM:I
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->RESTRICTED_CAPABILITIES:J
-Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->TRANSPORT_USB:I
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->UNRESTRICTED_CAPABILITIES:J
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->getDisplayTransport([I)I
 Landroid/net/connectivity/framework/util/NetworkCapabilitiesUtils;->inferRestrictedCapability(Landroid/net/NetworkCapabilities;)Z
@@ -4151,6 +4152,7 @@ Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_CHECKSUM
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ECHO_REPLY_TYPE:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ECHO_REQUEST_TYPE:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_HEADER_MIN_LEN:I
+Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NA_HEADER_LEN:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_LENGTH_SCALING_FACTOR:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MIN_LENGTH:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MTU:I
@@ -4161,9 +4163,11 @@ Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTIO
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ND_OPTION_TLLA:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_ADVERTISEMENT:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_SOLICITATION:I
+Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_NS_HEADER_LEN:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_RA_HEADER_LEN:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ROUTER_ADVERTISEMENT:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_ROUTER_SOLICITATION:I
+Landroid/net/connectivity/framework/util/NetworkStackConstants;->ICMPV6_RS_HEADER_LEN:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->INFINITE_LEASE:I
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->IPV4_ADDR_ALL:Ljava/net/Inet4Address;
 Landroid/net/connectivity/framework/util/NetworkStackConstants;->IPV4_ADDR_ANY:Ljava/net/Inet4Address;