Snap for 7821765 from f87b20864dee6d093cc3b4f62c6096a3daec7d7b to sc-qpr1-d-releaseandroid-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-release

Change-Id: I54802effb6677f1b1f75c7c2560cfcc563b3930f

3 files changed, 8 insertions, 4 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 9837a02..8bc3a33 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: "7653768"
+    build_id: "7785637"
     target: "mainline_modules-user"
     source_file: "mainline-sdks/wifi-module-sdk-current.zip"
   }
@@ -8,7 +8,7 @@ drops {
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/Wifi"
-  git_branch: "sc-dev"
+  git_branch: "sc-qpr1-dev"
   transform: TRANSFORM_UNZIP
   transform_options {
     rename {
diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index cc617c4..9a1aafe 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv
@@ -7710,7 +7710,6 @@ Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_C
 Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VEHICLE_INTERNAL:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VSIM:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->RESTRICTED_CAPABILITIES:J,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->TRANSPORT_USB:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->UNRESTRICTED_CAPABILITIES:J,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->getDisplayTransport([I)I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->inferRestrictedCapability(Landroid/net/NetworkCapabilities;)Z,blocked
@@ -7744,6 +7743,7 @@ Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_C
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ECHO_REPLY_TYPE:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ECHO_REQUEST_TYPE:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_HEADER_MIN_LEN:I,blocked
+Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NA_HEADER_LEN:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_LENGTH_SCALING_FACTOR:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MIN_LENGTH:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MTU:I,blocked
@@ -7754,9 +7754,11 @@ Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_N
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_TLLA:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_ADVERTISEMENT:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_SOLICITATION:I,blocked
+Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NS_HEADER_LEN:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_RA_HEADER_LEN:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ROUTER_ADVERTISEMENT:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ROUTER_SOLICITATION:I,blocked
+Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_RS_HEADER_LEN:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->INFINITE_LEASE:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_ALL:Ljava/net/Inet4Address;,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_ANY:Ljava/net/Inet4Address;,blocked
diff --git a/current/hiddenapi/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index 4f61f16..fb4b727 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv
@@ -7710,7 +7710,6 @@ Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_C
 Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VEHICLE_INTERNAL:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VSIM:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->RESTRICTED_CAPABILITIES:J
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->TRANSPORT_USB:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->UNRESTRICTED_CAPABILITIES:J
 Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->getDisplayTransport([I)I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->inferRestrictedCapability(Landroid/net/NetworkCapabilities;)Z
@@ -7744,6 +7743,7 @@ Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_C
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ECHO_REPLY_TYPE:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ECHO_REQUEST_TYPE:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_HEADER_MIN_LEN:I
+Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NA_HEADER_LEN:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_LENGTH_SCALING_FACTOR:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MIN_LENGTH:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MTU:I
@@ -7754,9 +7754,11 @@ Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_N
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_TLLA:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_ADVERTISEMENT:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_SOLICITATION:I
+Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NS_HEADER_LEN:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_RA_HEADER_LEN:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ROUTER_ADVERTISEMENT:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ROUTER_SOLICITATION:I
+Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_RS_HEADER_LEN:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->INFINITE_LEASE:I
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_ALL:Ljava/net/Inet4Address;
 Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_ANY:Ljava/net/Inet4Address;