Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / prebuilts / module_sdk / Wifi / refs/heads/int/12/fp4^1..refs/heads/int/12/fp4 / .
commit2c9db49535fbea47c0c41d9bab4e98a69882015d[log] [tgz]
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>Fri Jan 28 22:50:39 2022 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>Fri Jan 28 22:50:39 2022 +0000
tree0fce9b6d45f4987066d3a188817d4e460990e854
parentc1a08efbe8f7281d22c9702b635a6e10ccb69ef2 [diff]
parentd58ceb699556c16ca3e0aba6824d988fa0d2a4fa [diff]
Merge cherrypicks of [16738003, 16738004] into sc-v2-release.

Change-Id: Iba216055b554c0476eee51ad6f867d0863953ccf

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 136f28f..2c64081 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb

@@ -1,8 +1,8 @@
 drops {
   android_build_drop {
-    build_id: "7801381"
+    build_id: "7999070"
     target: "mainline_modules-user"
-    source_file: "mainline-sdks/wifi-module-sdk-current.zip"
+    source_file: "mainline-sdks/current/com.google.android.wifi/sdk/wifi-module-sdk-current.zip"
   }
   dest_file: "current/current.zip"
   version: ""

diff --git a/current/Android.bp b/current/Android.bp
index efc6ae3..4122341 100644
--- a/current/Android.bp
+++ b/current/Android.bp

@@ -1,11 +1,6 @@
 // This is auto-generated. DO NOT EDIT.
 
-package {
-    // A default list here prevents the license LSC from adding its own list which would
-    // be unnecessary as every module in the sdk already has its own licenses property.
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
 soong_config_module_type_import {
     from: "packages/modules/common/Android.bp",
     module_types: [
@@ -14,6 +9,12 @@
     ],
 }
 
+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: "wifi-module-sdk_com.android.wifi-bootclasspath-fragment@current",
     sdk_member_name: "com.android.wifi-bootclasspath-fragment",
@@ -35,6 +36,7 @@
 
 module_prebuilt_bootclasspath_fragment {
     name: "com.android.wifi-bootclasspath-fragment",
+    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {
@@ -97,6 +99,7 @@
 
 module_java_sdk_library_import {
     name: "framework-wifi",
+    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {

diff --git a/current/Android.bp.auto b/current/Android.bp.auto
old mode 100755
new mode 100644
index 0e28b2d..4d38028
--- a/current/Android.bp.auto
+++ b/current/Android.bp.auto

@@ -1,5 +1,14 @@
 // This is auto-generated. DO NOT EDIT.
 
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type_import {
+    from: "packages/modules/common/Android.bp",
+    module_types: [
+        "module_java_sdk_library_import",
+        "module_prebuilt_bootclasspath_fragment",
+    ],
+}
+
 package {
     // A default list here prevents the license LSC from adding its own list which would
     // be unnecessary as every module in the sdk already has its own licenses property.
@@ -25,9 +34,15 @@
     },
 }
 
-prebuilt_bootclasspath_fragment {
+module_prebuilt_bootclasspath_fragment {
     name: "com.android.wifi-bootclasspath-fragment",
-    prefer: false,
+    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
+    prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.wifi"],
     licenses: ["wifi-module-sdk_Android-Apache-2.0"],
@@ -64,6 +79,7 @@
         stub_srcs: ["sdk_library/public/framework-wifi.srcjar"],
         current_api: "sdk_library/public/framework-wifi.txt",
         removed_api: "sdk_library/public/framework-wifi-removed.txt",
+        annotations: "sdk_library/public/framework-wifi_annotations.zip",
         sdk_version: "module_current",
     },
     system: {
@@ -71,6 +87,7 @@
         stub_srcs: ["sdk_library/system/framework-wifi.srcjar"],
         current_api: "sdk_library/system/framework-wifi.txt",
         removed_api: "sdk_library/system/framework-wifi-removed.txt",
+        annotations: "sdk_library/system/framework-wifi_annotations.zip",
         sdk_version: "module_current",
     },
     module_lib: {
@@ -78,13 +95,20 @@
         stub_srcs: ["sdk_library/module-lib/framework-wifi.srcjar"],
         current_api: "sdk_library/module-lib/framework-wifi.txt",
         removed_api: "sdk_library/module-lib/framework-wifi-removed.txt",
+        annotations: "sdk_library/module-lib/framework-wifi_annotations.zip",
         sdk_version: "module_current",
     },
 }
 
-java_sdk_library_import {
+module_java_sdk_library_import {
     name: "framework-wifi",
-    prefer: false,
+    // Do not prefer prebuilt if SOONG_CONFIG_ANDROID_module_build_from_source is true.
+    prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
+    },
     visibility: ["//visibility:public"],
     apex_available: [
         "com.android.wifi",
@@ -102,6 +126,7 @@
         stub_srcs: ["sdk_library/public/framework-wifi.srcjar"],
         current_api: "sdk_library/public/framework-wifi.txt",
         removed_api: "sdk_library/public/framework-wifi-removed.txt",
+        annotations: "sdk_library/public/framework-wifi_annotations.zip",
         sdk_version: "module_current",
     },
     system: {
@@ -109,6 +134,7 @@
         stub_srcs: ["sdk_library/system/framework-wifi.srcjar"],
         current_api: "sdk_library/system/framework-wifi.txt",
         removed_api: "sdk_library/system/framework-wifi-removed.txt",
+        annotations: "sdk_library/system/framework-wifi_annotations.zip",
         sdk_version: "module_current",
     },
     module_lib: {
@@ -116,6 +142,7 @@
         stub_srcs: ["sdk_library/module-lib/framework-wifi.srcjar"],
         current_api: "sdk_library/module-lib/framework-wifi.txt",
         removed_api: "sdk_library/module-lib/framework-wifi-removed.txt",
+        annotations: "sdk_library/module-lib/framework-wifi_annotations.zip",
         sdk_version: "module_current",
     },
 }

diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index b64e4b8..905baf7 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv

@@ -2308,6 +2308,7 @@
 Landroid/net/wifi/WifiConfiguration;->isSuiteBCipherEcdheEcdsaEnabled()Z,blocked
 Landroid/net/wifi/WifiConfiguration;->isSuiteBCipherEcdheRsaEnabled()Z,blocked
 Landroid/net/wifi/WifiConfiguration;->isValidMacAddressForRandomization(Landroid/net/MacAddress;)Z,lo-prio,max-target-o
+Landroid/net/wifi/WifiConfiguration;->isWpa3EnterpriseConfiguration()Z,blocked
 Landroid/net/wifi/WifiConfiguration;->lambda$addSecurityParams$1(ILandroid/net/wifi/SecurityParams;)Z,blocked
 Landroid/net/wifi/WifiConfiguration;->lambda$addSecurityParams$2(Landroid/net/wifi/SecurityParams;Landroid/net/wifi/SecurityParams;)Z,blocked
 Landroid/net/wifi/WifiConfiguration;->lambda$enableFils$9(ZZLandroid/net/wifi/SecurityParams;)V,blocked
@@ -5910,7 +5911,7 @@
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->TAG:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_CHECK_INTERVAL_NEVER:J,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_OMADM:Ljava/lang/String;,lo-prio,max-target-o
-Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_SSP:Ljava/lang/String;,lo-prio,max-target-o
+Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_SPP:Ljava/lang/String;,blocked
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_HOMESP:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_ROAMING_PARTNER:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_UNRESTRICTED:Ljava/lang/String;,lo-prio,max-target-o
@@ -7495,79 +7496,17 @@
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastR()Z,blocked
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastS()Z,blocked
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastT()Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->all(Ljava/util/Collection;Ljava/util/function/Predicate;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->any(Landroid/util/SparseArray;Ljava/util/function/Predicate;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->any(Ljava/util/Collection;Ljava/util/function/Predicate;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([II)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([SS)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->filter(Ljava/util/Collection;Ljava/util/function/Predicate;)Ljava/util/ArrayList;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->indexOf(Ljava/util/Collection;Ljava/util/function/Predicate;)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->indexOf([Ljava/lang/Object;Ljava/lang/Object;)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->isEmpty(Ljava/util/Collection;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->isEmpty([Ljava/lang/Object;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->toIntArray(Ljava/util/Collection;)[I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->toLongArray(Ljava/util/Collection;)[J,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_DEFAULT_MODE:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OFF:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OFF_STRING:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OPPORTUNISTIC:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OPPORTUNISTIC_STRING:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_PROVIDER_HOSTNAME:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_PROVIDER_HOSTNAME_STRING:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_SPECIFIER:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsHostname(Landroid/content/Context;)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsMode(Landroid/content/Context;)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsModeAsInt(Ljava/lang/String;)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsModeAsString(I)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->setPrivateDnsHostname(Landroid/content/Context;Ljava/lang/String;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->setPrivateDnsMode(Landroid/content/Context;I)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;->addressAndPortToString(Ljava/net/InetAddress;I)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;->isIPv6ULA(Ljava/net/InetAddress;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;->saturatedCast(J)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;-><init>(Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;Ljava/nio/ByteBuffer;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->TAG:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->flags:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->getRecordCount(I)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->id:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->mRecordCount:[I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->rcode:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->this$0:Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;-><init>(Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;ILjava/nio/ByteBuffer;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->MAXLABELCOUNT:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->MAXLABELSIZE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->MAXNAMESIZE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->NAME_COMPRESSION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->NAME_NORMAL:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->TAG:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->dName:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->getRR()[B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->labelToString([B)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->mByteFormat:Ljava/text/DecimalFormat;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->mPos:Ljava/text/FieldPosition;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->mRdata:[B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->nsClass:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->nsType:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->parseName(Ljava/nio/ByteBuffer;I)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->this$0:Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->ttl:J,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException;-><init>(Ljava/lang/String;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException;->reason:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;-><clinit>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;-><init>([B)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->ANSECTION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->ARSECTION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->NSSECTION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->NUM_SECTIONS:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->QDSECTION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->TAG:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->mHeader:Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->mRecords:[Ljava/util/List;,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;-><clinit>()V,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;-><init>(ILjava/lang/String;)V,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtLeast(Ljava/lang/String;)Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtLeastInternal(Ljava/lang/String;)Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtMost(Ljava/lang/String;)Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtMostInternal(Ljava/lang/String;)Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isCodename(Ljava/lang/String;)Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mCodename:Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mIsReleaseBuild:Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mSdkInt:I,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->sInstance:Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;-><init>()V,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;->createFromParcel(Landroid/os/Parcel;)Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -7614,76 +7553,9 @@
 Lcom/android/wifi/x/com/android/net/module/util/InetAddressUtils;->INET6_ADDR_LENGTH:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/InetAddressUtils;->parcelInetAddress(Landroid/os/Parcel;Ljava/net/InetAddress;I)V,blocked
 Lcom/android/wifi/x/com/android/net/module/util/InetAddressUtils;->unparcelInetAddress(Landroid/os/Parcel;)Ljava/net/InetAddress;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;-><init>(Landroid/net/IpPrefix;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;-><init>(Ljava/net/InetAddress;Ljava/net/InetAddress;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->SIGNUM_POSITIVE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->addrToBigInteger([B)Ljava/math/BigInteger;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->asIpPrefixes()Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->containsRange(Lcom/android/wifi/x/com/android/net/module/util/IpRange;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getAsInetAddress([B)Ljava/net/InetAddress;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getEndAddr()Ljava/net/InetAddress;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getStartAddr()Ljava/net/InetAddress;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getSubsetPrefixes(Landroid/net/IpPrefix;)Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->mEndAddr:[B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->mStartAddr:[B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->overlapsRange(Lcom/android/wifi/x/com/android/net/module/util/IpRange;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->addressAndPortToString(Ljava/net/InetAddress;I)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->checksum(Ljava/nio/ByteBuffer;III)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->icmpv6Checksum(Ljava/nio/ByteBuffer;III)S,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->intAbs(S)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->ipChecksum(Ljava/nio/ByteBuffer;I)S,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->ipversion(Ljava/nio/ByteBuffer;I)B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->isValidUdpOrTcpPort(I)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->pseudoChecksumIPv4(Ljava/nio/ByteBuffer;III)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->pseudoChecksumIPv6(Ljava/nio/ByteBuffer;III)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->tcpChecksum(Ljava/nio/ByteBuffer;III)S,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->transportChecksum(Ljava/nio/ByteBuffer;IIII)S,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->udpChecksum(Ljava/nio/ByteBuffer;II)S,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;-><init>(Ljava/util/Collection;Ljava/util/Collection;Ljava/util/function/Function;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->added:Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->removed:Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->updated:Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;-><init>(Ljava/util/Collection;Ljava/util/Collection;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->added:Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->removed:Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->compareAddresses(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalAddresses(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalDnses(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalHttpProxy(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalInterfaceName(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalRoutes(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;-><init>(Landroid/content/Context;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->ERROR_LOCATION_MODE_OFF:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->ERROR_LOCATION_PERMISSION_MISSING:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->SUCCEEDED:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->TAG:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkCallersLocationPermission(Ljava/lang/String;Ljava/lang/String;IZLjava/lang/String;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkLocationPermission(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkLocationPermissionInternal(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkLocationPermissionWithDetailInfo(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkMainlineNetworkStackPermission(I)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkNetworkSettingsPermission(I)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkNetworkSetupWizardPermission(I)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkNetworkStackPermission(I)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkPackage(ILjava/lang/String;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->enforceLocationPermission(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->getCurrentUser()I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->getUidPermission(Ljava/lang/String;I)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->isLocationModeEnabled()Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->isTargetSdkLessThan(Ljava/lang/String;II)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->mAppOpsManager:Landroid/app/AppOpsManager;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->mContext:Landroid/content/Context;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->noteAppOpAllowed(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Z,blocked
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;-><clinit>()V,blocked
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->DEFAULT_MAC_ADDRESS:Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->DEFAULT_MAC_ADDRESS:Landroid/net/MacAddress;,blocked
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->ETHER_ADDR_LEN:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->LOCALLY_ASSIGNED_MASK:J,blocked
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->MULTICAST_MASK:J,blocked
@@ -7701,128 +7573,3 @@
 Lcom/android/wifi/x/com/android/net/module/util/NetUtils;->getNetworkPart(Ljava/net/InetAddress;I)Ljava/net/InetAddress;,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetUtils;->maskRawAddress([BI)V,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetUtils;->selectBestRoute(Ljava/util/Collection;Ljava/net/InetAddress;)Landroid/net/RouteInfo;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;-><clinit>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->DISPLAY_TRANSPORT_PRIORITIES:[I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->FORCE_RESTRICTED_CAPABILITIES:J,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_BIP:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_ENTERPRISE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_NOT_VCN_MANAGED:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_OEM_PRIVATE:I,blocked
-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;->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
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->packBits([I)J,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->unpackBits(J)[I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkIdentityUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkIdentityUtils;->scrubSubscriberId(Ljava/lang/String;)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkIdentityUtils;->scrubSubscriberIds([Ljava/lang/String;)[Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;-><clinit>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_ETHER_IPV4_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_HWTYPE_ETHER:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_HWTYPE_RESERVED_HI:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_HWTYPE_RESERVED_LO:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_PAYLOAD_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_REPLY:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_REQUEST:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->DHCP4_CLIENT_PORT:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_ADDR_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_BROADCAST:[B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_DST_ADDR_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_HEADER_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_MTU:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_SRC_ADDR_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_ARP:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_IPV4:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_IPV6:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_LENGTH:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_CHECKSUM_OFFSET:I,blocked
-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
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_PIO:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_PREF64:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_RDNSS:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_SLLA:I,blocked
-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
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_BITS:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_CONFLICT_ANNOUNCE_NUM:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_CONFLICT_PROBE_NUM:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_DST_ADDR_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_FLAGS_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_FRAGMENT_MASK:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_HEADER_MIN_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_IHL_MASK:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_MAX_MTU:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_MIN_MTU:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_PROTOCOL_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_SRC_ADDR_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ALL_HOSTS_MULTICAST:Ljava/net/Inet6Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ALL_NODES_MULTICAST:Ljava/net/Inet6Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ALL_ROUTERS_MULTICAST:Ljava/net/Inet6Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ANY:Ljava/net/Inet6Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_DST_ADDR_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_HEADER_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_LEN_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_MIN_MTU:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_PROTOCOL_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_SRC_ADDR_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->NEIGHBOR_ADVERTISEMENT_FLAG_ROUTER:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->NEIGHBOR_ADVERTISEMENT_FLAG_SOLICITED:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->PIO_FLAG_AUTONOMOUS:B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->PIO_FLAG_ON_LINK:B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ROUTER_ADVERTISEMENT_FLAG_MANAGED_ADDRESS:B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ROUTER_ADVERTISEMENT_FLAG_OTHER:B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_DHCP:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_DHCP_SERVER:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_DNS:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_NEIGHBOR:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_PROBE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->UDP_HEADER_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->VENDOR_SPECIFIC_IE_ID:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->makeInet4Address(BBBB)Ljava/net/Inet4Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->makeInet6Address([B)Ljava/net/Inet6Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->checkAnyPermissionOf(Landroid/content/Context;[Ljava/lang/String;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->enforceAnyPermissionOf(Landroid/content/Context;[Ljava/lang/String;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->enforceNetworkStackPermission(Landroid/content/Context;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->enforceNetworkStackPermissionOr(Landroid/content/Context;[Ljava/lang/String;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;-><clinit>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->EXCLLIST_PATTERN:Ljava/util/regex/Pattern;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->EXCLLIST_REGEXP:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->EXCL_REGEX:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->HOSTNAME_PATTERN:Ljava/util/regex/Pattern;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->HOSTNAME_REGEXP:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->NAME_IP_REGEX:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_EXCLLIST_INVALID:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_HOSTNAME_EMPTY:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_HOSTNAME_INVALID:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_PORT_EMPTY:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_PORT_INVALID:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_VALID:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->exclusionListAsString([Ljava/lang/String;)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->exclusionStringAsList(Ljava/lang/String;)Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->validate(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I,blocked

diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 27ee353..9c10e12 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv

@@ -29,24 +29,24 @@
 Landroid/net/wifi/ScanResult;->anqpLines:Ljava/util/List;,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,894,5,894,25,
 Landroid/net/wifi/ScanResult;->informationElements:[Landroid/net/wifi/ScanResult$InformationElement;,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1062,5,1062,25,
 Landroid/net/wifi/WifiConfiguration;->wepKeyVarNames:[Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,84,5,84,25,
-Landroid/net/wifi/WifiConfiguration;->apBand:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1030,5,1030,25,
-Landroid/net/wifi/WifiConfiguration;->apChannel:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1041,5,1041,25,
-Landroid/net/wifi/WifiConfiguration;->mIpConfiguration:Landroid/net/IpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1235,5,1235,25,
-Landroid/net/wifi/WifiConfiguration;->defaultGwMacAddress:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1248,5,1248,25,
-Landroid/net/wifi/WifiConfiguration;->validatedInternetAccess:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1255,5,1255,25,
-Landroid/net/wifi/WifiConfiguration;->INVALID_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1336,5,1336,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/wifi/WifiConfiguration;->numNoInternetAccessReports:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1343,5,1343,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiConfiguration;->noInternetAccessExpected:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1363,5,1363,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiConfiguration;->selfAdded:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1417,5,1417,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiConfiguration;->isEnterprise()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,2920,5,2920,25,
-Landroid/net/wifi/WifiConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3430,5,3430,25,
-Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3436,5,3436,25,
-Landroid/net/wifi/WifiConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3446,5,3446,25,
-Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3452,5,3452,25,
-Landroid/net/wifi/WifiConfiguration;->getProxySettings()Landroid/net/IpConfiguration$ProxySettings;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3462,5,3462,25,
-Landroid/net/wifi/WifiConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3468,5,3468,25,
-Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3525,5,3525,25,
-Landroid/net/wifi/WifiConfiguration;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3721,5,3721,25,
+Landroid/net/wifi/WifiConfiguration;->apBand:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1045,5,1045,25,
+Landroid/net/wifi/WifiConfiguration;->apChannel:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1056,5,1056,25,
+Landroid/net/wifi/WifiConfiguration;->mIpConfiguration:Landroid/net/IpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1250,5,1250,25,
+Landroid/net/wifi/WifiConfiguration;->defaultGwMacAddress:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1263,5,1263,25,
+Landroid/net/wifi/WifiConfiguration;->validatedInternetAccess:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1270,5,1270,25,
+Landroid/net/wifi/WifiConfiguration;->INVALID_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1351,5,1351,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/wifi/WifiConfiguration;->numNoInternetAccessReports:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1358,5,1358,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiConfiguration;->noInternetAccessExpected:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1378,5,1378,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiConfiguration;->selfAdded:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1432,5,1432,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiConfiguration;->isEnterprise()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,2935,5,2935,25,
+Landroid/net/wifi/WifiConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3417,5,3417,25,
+Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3423,5,3423,25,
+Landroid/net/wifi/WifiConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3433,5,3433,25,
+Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3439,5,3439,25,
+Landroid/net/wifi/WifiConfiguration;->getProxySettings()Landroid/net/IpConfiguration$ProxySettings;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3449,5,3449,25,
+Landroid/net/wifi/WifiConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3455,5,3455,25,
+Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3512,5,3512,25,
+Landroid/net/wifi/WifiConfiguration;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3708,5,3708,25,
 Landroid/net/wifi/WifiEnterpriseConfig;->mFields:Ljava/util/HashMap;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,250,5,250,25,
 Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateAlias(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,704,5,704,25,
 Landroid/net/wifi/WifiEnterpriseConfig;->getCaCertificateAlias()Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,745,5,745,25,
@@ -62,12 +62,12 @@
 Landroid/net/wifi/WifiInfo;->setLinkSpeed(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,723,5,723,25,
 Landroid/net/wifi/WifiInfo;->is5GHz()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,822,5,822,25,
 Landroid/net/wifi/WifiInfo;->setMacAddress(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,839,5,839,25,
-Landroid/net/wifi/WifiInfo;->getMeteredHint()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,878,5,878,25,
-Landroid/net/wifi/WifiInfo;->setNetworkId(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1067,5,1067,25,
-Landroid/net/wifi/WifiInfo;->setSupplicantState(Landroid/net/wifi/SupplicantState;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1096,5,1096,25,
-Landroid/net/wifi/WifiInfo;->setSupplicantState(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1144,5,1144,25,
-Landroid/net/wifi/WifiInfo;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1173,5,1173,25,
-Landroid/net/wifi/WifiInfo;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1286,5,1286,25,
+Landroid/net/wifi/WifiInfo;->getMeteredHint()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,877,5,877,25,
+Landroid/net/wifi/WifiInfo;->setNetworkId(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1066,5,1066,25,
+Landroid/net/wifi/WifiInfo;->setSupplicantState(Landroid/net/wifi/SupplicantState;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1095,5,1095,25,
+Landroid/net/wifi/WifiInfo;->setSupplicantState(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1143,5,1143,25,
+Landroid/net/wifi/WifiInfo;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1172,5,1172,25,
+Landroid/net/wifi/WifiInfo;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1285,5,1285,25,
 Landroid/net/wifi/WifiManager;->LINK_CONFIGURATION_CHANGED_ACTION:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1120,5,1120,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/wifi/WifiManager;->MIN_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1316,5,1316,25,
 Landroid/net/wifi/WifiManager;->MAX_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1320,5,1320,25,
@@ -77,9 +77,9 @@
 Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_2GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1353,5,1353,25,
 Landroid/net/wifi/WifiManager;->mActiveLockCount:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1374,5,1374,25,
 Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1378,5,1378,25,
-Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,4182,5,4182,25,
-Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,6048,5,6048,25,
-Landroid/net/wifi/WifiManager;->enableVerboseLogging(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,6088,5,6091,6,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+%23setVerboseLoggingEnabled%28boolean%29%7D+instead.%22
+Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,4180,5,4180,25,
+Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,6046,5,6046,25,
+Landroid/net/wifi/WifiManager;->enableVerboseLogging(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,6086,5,6089,6,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+%23setVerboseLoggingEnabled%28boolean%29%7D+instead.%22
 Landroid/net/wifi/WifiSsid;->octets:Ljava/io/ByteArrayOutputStream;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,48,5,48,25,
 Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,53,5,53,25,
 Landroid/net/wifi/WifiSsid;->createFromAsciiEncoded(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,72,5,72,25,

diff --git a/current/hiddenapi/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index bd44b6e..883e587 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv

@@ -2308,6 +2308,7 @@
 Landroid/net/wifi/WifiConfiguration;->isSuiteBCipherEcdheEcdsaEnabled()Z
 Landroid/net/wifi/WifiConfiguration;->isSuiteBCipherEcdheRsaEnabled()Z
 Landroid/net/wifi/WifiConfiguration;->isValidMacAddressForRandomization(Landroid/net/MacAddress;)Z
+Landroid/net/wifi/WifiConfiguration;->isWpa3EnterpriseConfiguration()Z
 Landroid/net/wifi/WifiConfiguration;->lambda$addSecurityParams$1(ILandroid/net/wifi/SecurityParams;)Z
 Landroid/net/wifi/WifiConfiguration;->lambda$addSecurityParams$2(Landroid/net/wifi/SecurityParams;Landroid/net/wifi/SecurityParams;)Z
 Landroid/net/wifi/WifiConfiguration;->lambda$enableFils$9(ZZLandroid/net/wifi/SecurityParams;)V
@@ -5910,7 +5911,7 @@
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->TAG:Ljava/lang/String;
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_CHECK_INTERVAL_NEVER:J
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_OMADM:Ljava/lang/String;
-Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_SSP:Ljava/lang/String;
+Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_SPP:Ljava/lang/String;
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_HOMESP:Ljava/lang/String;
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_ROAMING_PARTNER:Ljava/lang/String;
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_UNRESTRICTED:Ljava/lang/String;
@@ -7495,79 +7496,17 @@
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastR()Z
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastS()Z
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastT()Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->all(Ljava/util/Collection;Ljava/util/function/Predicate;)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->any(Landroid/util/SparseArray;Ljava/util/function/Predicate;)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->any(Ljava/util/Collection;Ljava/util/function/Predicate;)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([II)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([SS)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->filter(Ljava/util/Collection;Ljava/util/function/Predicate;)Ljava/util/ArrayList;
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->indexOf(Ljava/util/Collection;Ljava/util/function/Predicate;)I
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->indexOf([Ljava/lang/Object;Ljava/lang/Object;)I
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->isEmpty(Ljava/util/Collection;)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->isEmpty([Ljava/lang/Object;)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->toIntArray(Ljava/util/Collection;)[I
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->toLongArray(Ljava/util/Collection;)[J
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_DEFAULT_MODE:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OFF:I
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OFF_STRING:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OPPORTUNISTIC:I
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OPPORTUNISTIC_STRING:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_PROVIDER_HOSTNAME:I
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_PROVIDER_HOSTNAME_STRING:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_SPECIFIER:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsHostname(Landroid/content/Context;)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsMode(Landroid/content/Context;)I
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsModeAsInt(Ljava/lang/String;)I
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsModeAsString(I)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->setPrivateDnsHostname(Landroid/content/Context;Ljava/lang/String;)V
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->setPrivateDnsMode(Landroid/content/Context;I)V
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;->addressAndPortToString(Ljava/net/InetAddress;I)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;->isIPv6ULA(Ljava/net/InetAddress;)Z
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;->saturatedCast(J)I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;-><init>(Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;Ljava/nio/ByteBuffer;)V
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->TAG:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->flags:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->getRecordCount(I)I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->id:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->mRecordCount:[I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->rcode:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->this$0:Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;-><init>(Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;ILjava/nio/ByteBuffer;)V
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->MAXLABELCOUNT:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->MAXLABELSIZE:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->MAXNAMESIZE:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->NAME_COMPRESSION:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->NAME_NORMAL:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->TAG:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->dName:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->getRR()[B
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->labelToString([B)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->mByteFormat:Ljava/text/DecimalFormat;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->mPos:Ljava/text/FieldPosition;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->mRdata:[B
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->nsClass:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->nsType:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->parseName(Ljava/nio/ByteBuffer;I)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->this$0:Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->ttl:J
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException;-><init>(Ljava/lang/String;)V
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException;->reason:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;-><clinit>()V
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;-><init>([B)V
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->ANSECTION:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->ARSECTION:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->NSSECTION:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->NUM_SECTIONS:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->QDSECTION:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->TAG:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->mHeader:Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->mRecords:[Ljava/util/List;
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;-><clinit>()V
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;-><init>(ILjava/lang/String;)V
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtLeast(Ljava/lang/String;)Z
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtLeastInternal(Ljava/lang/String;)Z
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtMost(Ljava/lang/String;)Z
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtMostInternal(Ljava/lang/String;)Z
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isCodename(Ljava/lang/String;)Z
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mCodename:Ljava/lang/String;
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mIsReleaseBuild:Z
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mSdkInt:I
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->sInstance:Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;-><init>()V
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;->createFromParcel(Landroid/os/Parcel;)Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -7614,76 +7553,9 @@
 Lcom/android/wifi/x/com/android/net/module/util/InetAddressUtils;->INET6_ADDR_LENGTH:I
 Lcom/android/wifi/x/com/android/net/module/util/InetAddressUtils;->parcelInetAddress(Landroid/os/Parcel;Ljava/net/InetAddress;I)V
 Lcom/android/wifi/x/com/android/net/module/util/InetAddressUtils;->unparcelInetAddress(Landroid/os/Parcel;)Ljava/net/InetAddress;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;-><init>(Landroid/net/IpPrefix;)V
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;-><init>(Ljava/net/InetAddress;Ljava/net/InetAddress;)V
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->SIGNUM_POSITIVE:I
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->addrToBigInteger([B)Ljava/math/BigInteger;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->asIpPrefixes()Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->containsRange(Lcom/android/wifi/x/com/android/net/module/util/IpRange;)Z
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getAsInetAddress([B)Ljava/net/InetAddress;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getEndAddr()Ljava/net/InetAddress;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getStartAddr()Ljava/net/InetAddress;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getSubsetPrefixes(Landroid/net/IpPrefix;)Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->hashCode()I,core-platform-api,public-api,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->mEndAddr:[B
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->mStartAddr:[B
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->overlapsRange(Lcom/android/wifi/x/com/android/net/module/util/IpRange;)Z
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->addressAndPortToString(Ljava/net/InetAddress;I)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->checksum(Ljava/nio/ByteBuffer;III)I
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->icmpv6Checksum(Ljava/nio/ByteBuffer;III)S
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->intAbs(S)I
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->ipChecksum(Ljava/nio/ByteBuffer;I)S
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->ipversion(Ljava/nio/ByteBuffer;I)B
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->isValidUdpOrTcpPort(I)Z
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->pseudoChecksumIPv4(Ljava/nio/ByteBuffer;III)I
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->pseudoChecksumIPv6(Ljava/nio/ByteBuffer;III)I
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->tcpChecksum(Ljava/nio/ByteBuffer;III)S
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->transportChecksum(Ljava/nio/ByteBuffer;IIII)S
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->udpChecksum(Ljava/nio/ByteBuffer;II)S
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;-><init>(Ljava/util/Collection;Ljava/util/Collection;Ljava/util/function/Function;)V
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->added:Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->removed:Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->updated:Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;-><init>(Ljava/util/Collection;Ljava/util/Collection;)V
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->added:Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->removed:Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->compareAddresses(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalAddresses(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalDnses(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalHttpProxy(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalInterfaceName(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalRoutes(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;-><init>(Landroid/content/Context;)V
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->ERROR_LOCATION_MODE_OFF:I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->ERROR_LOCATION_PERMISSION_MISSING:I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->SUCCEEDED:I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->TAG:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkCallersLocationPermission(Ljava/lang/String;Ljava/lang/String;IZLjava/lang/String;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkLocationPermission(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkLocationPermissionInternal(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkLocationPermissionWithDetailInfo(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkMainlineNetworkStackPermission(I)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkNetworkSettingsPermission(I)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkNetworkSetupWizardPermission(I)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkNetworkStackPermission(I)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkPackage(ILjava/lang/String;)V
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->enforceLocationPermission(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)V
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->getCurrentUser()I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->getUidPermission(Ljava/lang/String;I)I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->isLocationModeEnabled()Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->isTargetSdkLessThan(Ljava/lang/String;II)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->mAppOpsManager:Landroid/app/AppOpsManager;
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->mContext:Landroid/content/Context;
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->noteAppOpAllowed(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Z
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;-><clinit>()V
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->DEFAULT_MAC_ADDRESS:Ljava/lang/String;
+Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->DEFAULT_MAC_ADDRESS:Landroid/net/MacAddress;
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->ETHER_ADDR_LEN:I
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->LOCALLY_ASSIGNED_MASK:J
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->MULTICAST_MASK:J
@@ -7701,128 +7573,3 @@
 Lcom/android/wifi/x/com/android/net/module/util/NetUtils;->getNetworkPart(Ljava/net/InetAddress;I)Ljava/net/InetAddress;
 Lcom/android/wifi/x/com/android/net/module/util/NetUtils;->maskRawAddress([BI)V
 Lcom/android/wifi/x/com/android/net/module/util/NetUtils;->selectBestRoute(Ljava/util/Collection;Ljava/net/InetAddress;)Landroid/net/RouteInfo;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;-><clinit>()V
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->DISPLAY_TRANSPORT_PRIORITIES:[I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->FORCE_RESTRICTED_CAPABILITIES:J
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_BIP:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_ENTERPRISE:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_NOT_VCN_MANAGED:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_OEM_PRIVATE:I
-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;->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
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->packBits([I)J
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->unpackBits(J)[I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkIdentityUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/NetworkIdentityUtils;->scrubSubscriberId(Ljava/lang/String;)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkIdentityUtils;->scrubSubscriberIds([Ljava/lang/String;)[Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;-><clinit>()V
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_ETHER_IPV4_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_HWTYPE_ETHER:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_HWTYPE_RESERVED_HI:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_HWTYPE_RESERVED_LO:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_PAYLOAD_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_REPLY:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_REQUEST:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->DHCP4_CLIENT_PORT:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_ADDR_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_BROADCAST:[B
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_DST_ADDR_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_HEADER_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_MTU:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_SRC_ADDR_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_ARP:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_IPV4:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_IPV6:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_LENGTH:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_CHECKSUM_OFFSET:I
-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
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_PIO:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_PREF64:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_RDNSS:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_SLLA:I
-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;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_BITS:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_CONFLICT_ANNOUNCE_NUM:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_CONFLICT_PROBE_NUM:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_DST_ADDR_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_FLAGS_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_FRAGMENT_MASK:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_HEADER_MIN_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_IHL_MASK:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_MAX_MTU:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_MIN_MTU:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_PROTOCOL_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_SRC_ADDR_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ALL_HOSTS_MULTICAST:Ljava/net/Inet6Address;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ALL_NODES_MULTICAST:Ljava/net/Inet6Address;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ALL_ROUTERS_MULTICAST:Ljava/net/Inet6Address;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ANY:Ljava/net/Inet6Address;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_DST_ADDR_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_HEADER_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_LEN_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_MIN_MTU:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_PROTOCOL_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_SRC_ADDR_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->NEIGHBOR_ADVERTISEMENT_FLAG_ROUTER:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->NEIGHBOR_ADVERTISEMENT_FLAG_SOLICITED:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->PIO_FLAG_AUTONOMOUS:B
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->PIO_FLAG_ON_LINK:B
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ROUTER_ADVERTISEMENT_FLAG_MANAGED_ADDRESS:B
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ROUTER_ADVERTISEMENT_FLAG_OTHER:B
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_DHCP:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_DHCP_SERVER:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_DNS:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_NEIGHBOR:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_PROBE:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->UDP_HEADER_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->VENDOR_SPECIFIC_IE_ID:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->makeInet4Address(BBBB)Ljava/net/Inet4Address;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->makeInet6Address([B)Ljava/net/Inet6Address;
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->checkAnyPermissionOf(Landroid/content/Context;[Ljava/lang/String;)Z
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->enforceAnyPermissionOf(Landroid/content/Context;[Ljava/lang/String;)V
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->enforceNetworkStackPermission(Landroid/content/Context;)V
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->enforceNetworkStackPermissionOr(Landroid/content/Context;[Ljava/lang/String;)V
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;-><clinit>()V
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->EXCLLIST_PATTERN:Ljava/util/regex/Pattern;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->EXCLLIST_REGEXP:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->EXCL_REGEX:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->HOSTNAME_PATTERN:Ljava/util/regex/Pattern;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->HOSTNAME_REGEXP:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->NAME_IP_REGEX:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_EXCLLIST_INVALID:I
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_HOSTNAME_EMPTY:I
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_HOSTNAME_INVALID:I
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_PORT_EMPTY:I
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_PORT_INVALID:I
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_VALID:I
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->exclusionListAsString([Ljava/lang/String;)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->exclusionStringAsList(Ljava/lang/String;)Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->validate(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I

diff --git a/current/sdk_library/module-lib/framework-wifi_annotations.zip b/current/sdk_library/module-lib/framework-wifi_annotations.zip
new file mode 100644
index 0000000..4b3d341
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-wifi_annotations.zip
Binary files differ

diff --git a/current/sdk_library/public/framework-wifi-stubs.jar b/current/sdk_library/public/framework-wifi-stubs.jar
index 41bcc6d..9db5a66 100644
--- a/current/sdk_library/public/framework-wifi-stubs.jar
+++ b/current/sdk_library/public/framework-wifi-stubs.jar
Binary files differ

diff --git a/current/sdk_library/public/framework-wifi.srcjar b/current/sdk_library/public/framework-wifi.srcjar
index 71c6c71..f3b584b 100644
--- a/current/sdk_library/public/framework-wifi.srcjar
+++ b/current/sdk_library/public/framework-wifi.srcjar
Binary files differ

diff --git a/current/sdk_library/public/framework-wifi.txt b/current/sdk_library/public/framework-wifi.txt
index c5d9c2f..e8db727 100644
--- a/current/sdk_library/public/framework-wifi.txt
+++ b/current/sdk_library/public/framework-wifi.txt

@@ -297,7 +297,7 @@
     method @Nullable public java.util.List<android.net.wifi.ScanResult.InformationElement> getInformationElements();
     method @Deprecated public int getIpAddress();
     method public int getLinkSpeed();
-    method @RequiresPermission(allOf={android.Manifest.permission.LOCAL_MAC_ADDRESS, android.Manifest.permission.ACCESS_FINE_LOCATION}) public String getMacAddress();
+    method public String getMacAddress();
     method public int getMaxSupportedRxLinkSpeedMbps();
     method public int getMaxSupportedTxLinkSpeedMbps();
     method public int getNetworkId();
@@ -343,7 +343,7 @@
 
   public class WifiManager {
     method @Deprecated public int addNetwork(android.net.wifi.WifiConfiguration);
-    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_MANAGED_PROVISIONING}) public android.net.wifi.WifiManager.AddNetworkResult addNetworkPrivileged(@NonNull android.net.wifi.WifiConfiguration);
+    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_MANAGED_PROVISIONING}, conditional=true) public android.net.wifi.WifiManager.AddNetworkResult addNetworkPrivileged(@NonNull android.net.wifi.WifiConfiguration);
     method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public int addNetworkSuggestions(@NonNull java.util.List<android.net.wifi.WifiNetworkSuggestion>);
     method public void addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);
     method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE}) public void addSuggestionConnectionStatusListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SuggestionConnectionStatusListener);
@@ -358,7 +358,7 @@
     method @Deprecated public boolean disableNetwork(int);
     method @Deprecated public boolean disconnect();
     method @Deprecated public boolean enableNetwork(int, boolean);
-    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_MANAGED_PROVISIONING, android.Manifest.permission.NETWORK_CARRIER_PROVISIONING}) public void flushPasspointAnqpCache();
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_MANAGED_PROVISIONING, android.Manifest.permission.NETWORK_CARRIER_PROVISIONING}, conditional=true) public void flushPasspointAnqpCache();
     method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public java.util.List<android.net.wifi.WifiConfiguration> getCallerConfiguredNetworks();
     method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE}) public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();
     method @Deprecated public android.net.wifi.WifiInfo getConnectionInfo();
@@ -366,7 +366,7 @@
     method public int getMaxNumberOfNetworkSuggestionsPerApp();
     method @IntRange(from=0) public int getMaxSignalLevel();
     method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public java.util.List<android.net.wifi.WifiNetworkSuggestion> getNetworkSuggestions();
-    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
+    method @Deprecated public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
     method public java.util.List<android.net.wifi.ScanResult> getScanResults();
     method public int getWifiState();
     method public boolean is24GHzBandSupported();
@@ -408,7 +408,7 @@
     method @Deprecated public boolean removeNetwork(int);
     method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public int removeNetworkSuggestions(@NonNull java.util.List<android.net.wifi.WifiNetworkSuggestion>);
     method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public boolean removeNonCallerConfiguredNetworks();
-    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_CARRIER_PROVISIONING}) public void removePasspointConfiguration(String);
+    method @Deprecated public void removePasspointConfiguration(String);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void removeSuggestionConnectionStatusListener(@NonNull android.net.wifi.WifiManager.SuggestionConnectionStatusListener);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void removeSuggestionUserApprovalStatusListener(@NonNull android.net.wifi.WifiManager.SuggestionUserApprovalStatusListener);
     method @Deprecated public boolean saveConfiguration();

diff --git a/current/sdk_library/public/framework-wifi_annotations.zip b/current/sdk_library/public/framework-wifi_annotations.zip
new file mode 100644
index 0000000..ddaab83
--- /dev/null
+++ b/current/sdk_library/public/framework-wifi_annotations.zip
Binary files differ

diff --git a/current/sdk_library/system/framework-wifi_annotations.zip b/current/sdk_library/system/framework-wifi_annotations.zip
new file mode 100644
index 0000000..4b3d341
--- /dev/null
+++ b/current/sdk_library/system/framework-wifi_annotations.zip
Binary files differ