diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index e54a0c9..2c354dc 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,14 +1,14 @@
 drops {
   android_build_drop {
-    build_id: "T1008598"
-    target: "train_build"
-    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.wifi/sdk/wifi-module-sdk-current.zip"
+    build_id: "10917791"
+    target: "mainline_modules_sdks-trunk-userdebug"
+    source_file: "mainline-sdks/for-latest-build/current/com.google.android.wifi/sdk/wifi-module-sdk-current.zip"
   }
   dest_file: "current/current.zip"
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/Wifi"
-  git_branch: "udc-qpr-dev"
+  git_branch: "main"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
index 94db544..69fb67c 100644
--- a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
@@ -1,14 +1,14 @@
 drops {
   android_build_drop {
-    build_id: "T1008598"
-    target: "train_build"
-    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.wifi/sdk/wifi-module-sdk-current.zip"
+    build_id: "10917791"
+    target: "mainline_go_modules_sdks-trunk-userdebug"
+    source_file: "mainline-sdks/for-latest-build/current/com.google.android.go.wifi/sdk/wifi-module-sdk-current.zip"
   }
   dest_file: "go/current/current.zip"
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/Wifi"
-  git_branch: "udc-qpr-dev"
+  git_branch: "main"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index c252b6a..e562d90 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -422,6 +422,18 @@
 Landroid/net/wifi/MloLink;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/MloLink;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/MloLink;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$Builder;-><init>(ILandroid/os/Parcelable;)V,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$Builder;->build()Landroid/net/wifi/OuiKeyedData;,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->getData()Landroid/os/Parcelable;,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->getOui()I,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ParcelUtil;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/ParcelUtil;->readCertificate(Landroid/os/Parcel;)Ljava/security/cert/X509Certificate;,lo-prio,max-target-o
 Landroid/net/wifi/ParcelUtil;->readCertificates(Landroid/os/Parcel;)[Ljava/security/cert/X509Certificate;,lo-prio,max-target-o
@@ -876,6 +888,7 @@
 Landroid/net/wifi/SoftApConfiguration$Builder;->setPassphrase(Ljava/lang/String;I)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setShutdownTimeoutMillis(J)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setSsid(Ljava/lang/String;)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder;->setVendorData(Ljava/util/List;)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setVendorElements(Ljava/util/List;)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setWifiSsid(Landroid/net/wifi/WifiSsid;)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->BAND_2GHZ:I,sdk,system-api,test-api
@@ -912,6 +925,7 @@
 Landroid/net/wifi/SoftApConfiguration;->getSecurityType()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getShutdownTimeoutMillis()J,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getSsid()Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getVendorData()Ljava/util/List;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getVendorElements()Ljava/util/List;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getWifiSsid()Landroid/net/wifi/WifiSsid;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
@@ -1009,28 +1023,28 @@
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda11;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda12;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda12;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda15;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda16;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda1;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda22;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda24;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -1097,6 +1111,7 @@
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_NO_INTERNET_PERMANENT:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_NO_INTERNET_TEMPORARY:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_TRANSITION_DISABLE_INDICATION:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_UNWANTED_LOW_RSSI:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->INVALID_NETWORK_SELECTION_DISABLE_TIMESTAMP:J,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_DISABLED_MAX:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_DISABLED_STARTING_INDEX:I,lo-prio,max-target-o
@@ -1859,6 +1874,9 @@
 Landroid/net/wifi/WifiManager$WifiLock;->setReferenceCounted(Z)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiLock;->setWorkSource(Landroid/os/WorkSource;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiLock;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;->onActivatedStateChanged(Z)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;->onActiveUsersChanged([I)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;->onOwnershipChanged([I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;->WIFI_NETWORK_STATUS_AUTHENTICATING:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;->WIFI_NETWORK_STATUS_CONNECTED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;->WIFI_NETWORK_STATUS_CONNECTING:I,sdk,system-api,test-api
@@ -1917,6 +1935,7 @@
 Landroid/net/wifi/WifiManager;->API_SCANNING_ENABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_NETWORK_SELECTION_CONFIG:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_ONE_SHOT_SCREEN_ON_CONNECTIVITY_SCAN_DELAY:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_SET_PNO_SCAN_ENABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_SCAN_SCHEDULE:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_TDLS_ENABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_TDLS_ENABLED_WITH_MAC_ADDRESS:I,sdk,system-api,test-api
@@ -2051,6 +2070,7 @@
 Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_DISABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_ENABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_ENABLED_SHOW_KEY:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_WIFI_AWARE_ENABLED_ONLY:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_AP_STATE_CHANGED_ACTION:Ljava/lang/String;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_AP_STATE_DISABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_AP_STATE_DISABLING:I,sdk,system-api,test-api
@@ -2096,6 +2116,7 @@
 Landroid/net/wifi/WifiManager;->addQosPolicies(Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->addSuggestionConnectionStatusListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->addSuggestionUserApprovalStatusListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListener;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->addWifiLowLatencyLockListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->addWifiNetworkStateChangedListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->addWifiVerboseLoggingStatusChangedListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->allowAutojoin(IZ)V,sdk,system-api,test-api
@@ -2141,6 +2162,8 @@
 Landroid/net/wifi/WifiManager;->getMatchingOsuProviders(Ljava/util/List;)Ljava/util/Map;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMatchingPasspointConfigsForOsuProviders(Ljava/util/Set;)Ljava/util/Map;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMatchingScanResults(Ljava/util/List;Ljava/util/List;)Ljava/util/Map;,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->getMaxMloAssociationLinkCount(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->getMaxMloStrLinkCount(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMaxNumberOfChannelsPerNetworkSpecifierRequest()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMaxNumberOfNetworkSuggestionsPerApp()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMaxNumberOfPoliciesPerQosRequest()I,sdk,system-api,test-api
@@ -2158,6 +2181,7 @@
 Landroid/net/wifi/WifiManager;->getSoftApConfiguration()Landroid/net/wifi/SoftApConfiguration;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getSsidsAllowlist()Ljava/util/Set;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getStaConcurrencyForMultiInternetMode()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->getSupportedSimultaneousBandCombinations(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getUsableChannels(II)Ljava/util/List;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getVerboseLoggingLevel()I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getWifiActivityEnergyInfoAsync(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoListener;)V,sdk,system-api,test-api
@@ -2184,6 +2208,7 @@
 Landroid/net/wifi/WifiManager;->isEasyConnectSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isEnhancedOpenSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isEnhancedPowerReportingSupported()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->isLowLatencyModeSupported()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isMakeBeforeBreakWifiSwitchingSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isMulticastEnabled()Z,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->isOffChannelTdlsSupported()Z,lo-prio,max-target-o
@@ -2256,6 +2281,7 @@
 Landroid/net/wifi/WifiManager;->removeQosPolicies([I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeSuggestionConnectionStatusListener(Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeSuggestionUserApprovalStatusListener(Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListener;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->removeWifiLowLatencyLockListener(Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeWifiNetworkStateChangedListener(Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->reportCreateInterfaceImpact(IZLjava/util/concurrent/Executor;Ljava/util/function/BiConsumer;)V,public-api,sdk,system-api,test-api
@@ -2281,6 +2307,7 @@
 Landroid/net/wifi/WifiManager;->setOneShotScreenOnConnectivityScanDelayMillis(I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setOverrideCountryCode(Ljava/lang/String;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setPasspointMeteredOverride(Ljava/lang/String;I)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->setPnoScanEnabled(ZZ)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setScanAlwaysAvailable(Z)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setScanThrottleEnabled(Z)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setScreenOnScanSchedule(Ljava/util/List;)V,sdk,system-api,test-api
@@ -2810,10 +2837,12 @@
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalBeaconRx()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalBeaconRx(I)J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalCcaBusyFreqTimeMillis()J,sdk,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalCcaBusyFreqTimeMillis(I)J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalHotspot2ScanTimeMillis()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalNanScanTimeMillis()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalPnoScanTimeMillis()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioOnFreqTimeMillis()J,sdk,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioOnFreqTimeMillis(I)J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioOnTimeMillis()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioRxTimeMillis()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioTxTimeMillis()J,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 042e506..2da3a99 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -207,6 +207,18 @@
 Landroid/net/wifi/MloLink;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/MloLink;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/MloLink;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$Builder;-><init>(ILandroid/os/Parcelable;)V,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$Builder;->build()Landroid/net/wifi/OuiKeyedData;,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->describeContents()I,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->getData()Landroid/os/Parcelable;,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->getOui()I,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/wifi/QosPolicyParams$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/QosPolicyParams$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/QosPolicyParams$Builder;-><init>(II)V,system-api,test-api
@@ -596,6 +608,7 @@
 Landroid/net/wifi/SoftApConfiguration$Builder;->setPassphrase(Ljava/lang/String;I)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setShutdownTimeoutMillis(J)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setSsid(Ljava/lang/String;)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder;->setVendorData(Ljava/util/List;)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setVendorElements(Ljava/util/List;)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setWifiSsid(Landroid/net/wifi/WifiSsid;)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->BAND_2GHZ:I,system-api,test-api
@@ -632,6 +645,7 @@
 Landroid/net/wifi/SoftApConfiguration;->getSecurityType()I,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getShutdownTimeoutMillis()J,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getSsid()Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getVendorData()Ljava/util/List;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getVendorElements()Ljava/util/List;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getWifiSsid()Landroid/net/wifi/WifiSsid;,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->hashCode()I,core-platform-api,public-api,system-api,test-api
@@ -725,28 +739,28 @@
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda11;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda12;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda12;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda15;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda16;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda1;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda22;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda24;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
@@ -806,6 +820,7 @@
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_NO_INTERNET_PERMANENT:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_NO_INTERNET_TEMPORARY:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_TRANSITION_DISABLE_INDICATION:I,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_UNWANTED_LOW_RSSI:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_ENABLED:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_PERMANENTLY_DISABLED:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_TEMPORARY_DISABLED:I,system-api,test-api
@@ -1336,6 +1351,9 @@
 Landroid/net/wifi/WifiManager$WifiLock;->setReferenceCounted(Z)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiLock;->setWorkSource(Landroid/os/WorkSource;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiLock;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;->onActivatedStateChanged(Z)V,system-api,test-api
+Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;->onActiveUsersChanged([I)V,system-api,test-api
+Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;->onOwnershipChanged([I)V,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;->WIFI_NETWORK_STATUS_AUTHENTICATING:I,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;->WIFI_NETWORK_STATUS_CONNECTED:I,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;->WIFI_NETWORK_STATUS_CONNECTING:I,system-api,test-api
@@ -1389,6 +1407,7 @@
 Landroid/net/wifi/WifiManager;->API_SCANNING_ENABLED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_NETWORK_SELECTION_CONFIG:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_ONE_SHOT_SCREEN_ON_CONNECTIVITY_SCAN_DELAY:I,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_SET_PNO_SCAN_ENABLED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_SCAN_SCHEDULE:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_TDLS_ENABLED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_TDLS_ENABLED_WITH_MAC_ADDRESS:I,system-api,test-api
@@ -1502,6 +1521,7 @@
 Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_DISABLED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_ENABLED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_ENABLED_SHOW_KEY:I,system-api,test-api
+Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_WIFI_AWARE_ENABLED_ONLY:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_AP_STATE_CHANGED_ACTION:Ljava/lang/String;,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_AP_STATE_DISABLED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_AP_STATE_DISABLING:I,system-api,test-api
@@ -1542,6 +1562,7 @@
 Landroid/net/wifi/WifiManager;->addQosPolicies(Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->addSuggestionConnectionStatusListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->addSuggestionUserApprovalStatusListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListener;)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->addWifiLowLatencyLockListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->addWifiNetworkStateChangedListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->addWifiVerboseLoggingStatusChangedListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->allowAutojoin(IZ)V,system-api,test-api
@@ -1583,6 +1604,8 @@
 Landroid/net/wifi/WifiManager;->getMatchingOsuProviders(Ljava/util/List;)Ljava/util/Map;,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMatchingPasspointConfigsForOsuProviders(Ljava/util/Set;)Ljava/util/Map;,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMatchingScanResults(Ljava/util/List;Ljava/util/List;)Ljava/util/Map;,system-api,test-api
+Landroid/net/wifi/WifiManager;->getMaxMloAssociationLinkCount(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,system-api,test-api
+Landroid/net/wifi/WifiManager;->getMaxMloStrLinkCount(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMaxNumberOfChannelsPerNetworkSpecifierRequest()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMaxNumberOfNetworkSuggestionsPerApp()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMaxNumberOfPoliciesPerQosRequest()I,system-api,test-api
@@ -1600,6 +1623,7 @@
 Landroid/net/wifi/WifiManager;->getSoftApConfiguration()Landroid/net/wifi/SoftApConfiguration;,system-api,test-api
 Landroid/net/wifi/WifiManager;->getSsidsAllowlist()Ljava/util/Set;,system-api,test-api
 Landroid/net/wifi/WifiManager;->getStaConcurrencyForMultiInternetMode()I,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->getSupportedSimultaneousBandCombinations(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->getUsableChannels(II)Ljava/util/List;,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->getVerboseLoggingLevel()I,system-api,test-api
 Landroid/net/wifi/WifiManager;->getWifiActivityEnergyInfoAsync(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoListener;)V,system-api,test-api
@@ -1625,6 +1649,7 @@
 Landroid/net/wifi/WifiManager;->isEasyConnectSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isEnhancedOpenSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isEnhancedPowerReportingSupported()Z,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->isLowLatencyModeSupported()Z,system-api,test-api
 Landroid/net/wifi/WifiManager;->isMakeBeforeBreakWifiSwitchingSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isP2pSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isPasspointTermsAndConditionsSupported()Z,public-api,system-api,test-api
@@ -1683,6 +1708,7 @@
 Landroid/net/wifi/WifiManager;->removeQosPolicies([I)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeSuggestionConnectionStatusListener(Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeSuggestionUserApprovalStatusListener(Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListener;)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->removeWifiLowLatencyLockListener(Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeWifiNetworkStateChangedListener(Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->reportCreateInterfaceImpact(IZLjava/util/concurrent/Executor;Ljava/util/function/BiConsumer;)V,public-api,system-api,test-api
@@ -1707,6 +1733,7 @@
 Landroid/net/wifi/WifiManager;->setOneShotScreenOnConnectivityScanDelayMillis(I)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->setOverrideCountryCode(Ljava/lang/String;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->setPasspointMeteredOverride(Ljava/lang/String;I)V,system-api,test-api
+Landroid/net/wifi/WifiManager;->setPnoScanEnabled(ZZ)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->setScanAlwaysAvailable(Z)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->setScanThrottleEnabled(Z)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->setScreenOnScanSchedule(Ljava/util/List;)V,system-api,test-api
@@ -2165,10 +2192,12 @@
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalBeaconRx()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalBeaconRx(I)J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalCcaBusyFreqTimeMillis()J,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalCcaBusyFreqTimeMillis(I)J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalHotspot2ScanTimeMillis()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalNanScanTimeMillis()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalPnoScanTimeMillis()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioOnFreqTimeMillis()J,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioOnFreqTimeMillis(I)J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioOnTimeMillis()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioRxTimeMillis()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioTxTimeMillis()J,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index c27f7b1..fafddb7 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -38,47 +38,47 @@
 Landroid/net/wifi/WifiConfiguration;->numNoInternetAccessReports:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1446,5,1446,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/wifi/WifiConfiguration;->noInternetAccessExpected:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1464,5,1464,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/wifi/WifiConfiguration;->selfAdded:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1526,5,1526,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiConfiguration;->isEnterprise()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3280,5,3280,25,
-Landroid/net/wifi/WifiConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3784,5,3784,25,
-Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3790,5,3790,25,
-Landroid/net/wifi/WifiConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3800,5,3800,25,
-Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3806,5,3806,25,
-Landroid/net/wifi/WifiConfiguration;->getProxySettings()Landroid/net/IpConfiguration$ProxySettings;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3816,5,3816,25,
-Landroid/net/wifi/WifiConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3822,5,3822,25,
-Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3882,5,3882,25,
-Landroid/net/wifi/WifiEnterpriseConfig;->mFields:Ljava/util/HashMap;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,334,5,334,25,
-Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateAlias(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,909,5,909,25,
-Landroid/net/wifi/WifiEnterpriseConfig;->getCaCertificateAlias()Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,960,5,960,25,
-Landroid/net/wifi/WifiInfo;->mBSSID:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,114,5,114,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/wifi/WifiInfo;->mWifiSsid:Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,116,5,116,25,
-Landroid/net/wifi/WifiInfo;->mIpAddress:Ljava/net/InetAddress;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,261,5,261,25,
-Landroid/net/wifi/WifiInfo;->mMacAddress:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,263,5,263,25,
-Landroid/net/wifi/WifiInfo;->score:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,425,5,425,25,
-Landroid/net/wifi/WifiInfo;-><init>()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,490,5,490,25,
-Landroid/net/wifi/WifiInfo;->getWifiSsid()Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,783,5,783,25,
-Landroid/net/wifi/WifiInfo;->setBSSID(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,789,5,789,25,
-Landroid/net/wifi/WifiInfo;->setRssi(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,967,5,967,25,
-Landroid/net/wifi/WifiInfo;->setLinkSpeed(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1013,5,1013,25,
-Landroid/net/wifi/WifiInfo;->is5GHz()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1119,5,1119,25,
-Landroid/net/wifi/WifiInfo;->setMacAddress(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1136,5,1136,25,
-Landroid/net/wifi/WifiInfo;->getMeteredHint()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1176,5,1176,25,
-Landroid/net/wifi/WifiInfo;->setNetworkId(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1380,5,1380,25,
-Landroid/net/wifi/WifiInfo;->setSupplicantState(Landroid/net/wifi/SupplicantState;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1409,5,1409,25,
-Landroid/net/wifi/WifiInfo;->setSupplicantState(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1465,5,1465,25,
-Landroid/net/wifi/WifiInfo;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1494,5,1494,25,
-Landroid/net/wifi/WifiInfo;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1638,5,1638,25,
-Landroid/net/wifi/WifiManager;->LINK_CONFIGURATION_CHANGED_ACTION:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1638,5,1638,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiManager;->MIN_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1843,5,1843,25,
-Landroid/net/wifi/WifiManager;->MAX_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1847,5,1847,25,
-Landroid/net/wifi/WifiManager;->RSSI_LEVELS:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1857,5,1857,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_AUTO:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1866,5,1866,25,
-Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_5GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1873,5,1873,25,
-Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_2GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1880,5,1880,25,
-Landroid/net/wifi/WifiManager;->mActiveLockCount:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,2009,5,2009,25,
-Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,2013,5,2013,25,
-Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,5768,5,5768,25,
-Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,8198,5,8198,25,
-Landroid/net/wifi/WifiManager;->enableVerboseLogging(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,8238,5,8241,6,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+%23setVerboseLoggingEnabled%28boolean%29%7D+instead.%22
+Landroid/net/wifi/WifiConfiguration;->isEnterprise()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3279,5,3279,25,
+Landroid/net/wifi/WifiConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3783,5,3783,25,
+Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3789,5,3789,25,
+Landroid/net/wifi/WifiConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3799,5,3799,25,
+Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3805,5,3805,25,
+Landroid/net/wifi/WifiConfiguration;->getProxySettings()Landroid/net/IpConfiguration$ProxySettings;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3815,5,3815,25,
+Landroid/net/wifi/WifiConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3821,5,3821,25,
+Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3881,5,3881,25,
+Landroid/net/wifi/WifiEnterpriseConfig;->mFields:Ljava/util/HashMap;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,396,5,396,25,
+Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateAlias(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,979,5,979,25,
+Landroid/net/wifi/WifiEnterpriseConfig;->getCaCertificateAlias()Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,1030,5,1030,25,
+Landroid/net/wifi/WifiInfo;->mBSSID:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,115,5,115,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/wifi/WifiInfo;->mWifiSsid:Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,117,5,117,25,
+Landroid/net/wifi/WifiInfo;->mIpAddress:Ljava/net/InetAddress;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,265,5,265,25,
+Landroid/net/wifi/WifiInfo;->mMacAddress:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,267,5,267,25,
+Landroid/net/wifi/WifiInfo;->score:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,429,5,429,25,
+Landroid/net/wifi/WifiInfo;-><init>()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,494,5,494,25,
+Landroid/net/wifi/WifiInfo;->getWifiSsid()Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,787,5,787,25,
+Landroid/net/wifi/WifiInfo;->setBSSID(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,793,5,793,25,
+Landroid/net/wifi/WifiInfo;->setRssi(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,984,5,984,25,
+Landroid/net/wifi/WifiInfo;->setLinkSpeed(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1030,5,1030,25,
+Landroid/net/wifi/WifiInfo;->is5GHz()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1136,5,1136,25,
+Landroid/net/wifi/WifiInfo;->setMacAddress(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1153,5,1153,25,
+Landroid/net/wifi/WifiInfo;->getMeteredHint()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1193,5,1193,25,
+Landroid/net/wifi/WifiInfo;->setNetworkId(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1397,5,1397,25,
+Landroid/net/wifi/WifiInfo;->setSupplicantState(Landroid/net/wifi/SupplicantState;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1426,5,1426,25,
+Landroid/net/wifi/WifiInfo;->setSupplicantState(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1482,5,1482,25,
+Landroid/net/wifi/WifiInfo;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1511,5,1511,25,
+Landroid/net/wifi/WifiInfo;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1655,5,1655,25,
+Landroid/net/wifi/WifiManager;->LINK_CONFIGURATION_CHANGED_ACTION:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1639,5,1639,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiManager;->MIN_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1844,5,1844,25,
+Landroid/net/wifi/WifiManager;->MAX_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1848,5,1848,25,
+Landroid/net/wifi/WifiManager;->RSSI_LEVELS:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1858,5,1858,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_AUTO:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1867,5,1867,25,
+Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_5GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1874,5,1874,25,
+Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_2GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1881,5,1881,25,
+Landroid/net/wifi/WifiManager;->mActiveLockCount:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,2010,5,2010,25,
+Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,2014,5,2014,25,
+Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,5778,5,5778,25,
+Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,8212,5,8212,25,
+Landroid/net/wifi/WifiManager;->enableVerboseLogging(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,8258,5,8261,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,206,5,206,69,publicAlternatives=%22%7B%40link+%23getBytes%28%29%7D%22
 Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,214,5,214,99,publicAlternatives=%22%7B%40link+android.net.wifi.WifiManager%23UNKNOWN_SSID%7D%22
 Landroid/net/wifi/WifiSsid;->createFromAsciiEncoded(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,222,5,222,76,publicAlternatives=%22%7B%40link+%23fromBytes%28byte%5B%5D%29%7D%22
diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
index b26c8e4..d6de6c5 100644
--- a/current/hiddenapi/signature-patterns.csv
+++ b/current/hiddenapi/signature-patterns.csv
@@ -39,6 +39,7 @@
 android/net/wifi/IWifiScannerListener
 android/net/wifi/IWifiVerboseLoggingStatusChangedListener
 android/net/wifi/MloLink
+android/net/wifi/OuiKeyedData
 android/net/wifi/ParcelUtil
 android/net/wifi/QosPolicyParams
 android/net/wifi/RttManager
diff --git a/current/sdk_library/module-lib/framework-wifi-stubs.jar b/current/sdk_library/module-lib/framework-wifi-stubs.jar
index 60427e0..695893d 100644
--- a/current/sdk_library/module-lib/framework-wifi-stubs.jar
+++ b/current/sdk_library/module-lib/framework-wifi-stubs.jar
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-wifi.srcjar b/current/sdk_library/module-lib/framework-wifi.srcjar
index fd9fb6d..01097a9 100644
--- a/current/sdk_library/module-lib/framework-wifi.srcjar
+++ b/current/sdk_library/module-lib/framework-wifi.srcjar
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-wifi_annotations.zip b/current/sdk_library/module-lib/framework-wifi_annotations.zip
index 8bb2818..572088e 100644
--- a/current/sdk_library/module-lib/framework-wifi_annotations.zip
+++ 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 cb0ff54..345812e 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 941a721..dbdf7fc 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/system/framework-wifi-stubs.jar b/current/sdk_library/system/framework-wifi-stubs.jar
index 12deba5..8f444d0 100644
--- a/current/sdk_library/system/framework-wifi-stubs.jar
+++ b/current/sdk_library/system/framework-wifi-stubs.jar
Binary files differ
diff --git a/current/sdk_library/system/framework-wifi.srcjar b/current/sdk_library/system/framework-wifi.srcjar
index d88a6a6..2b4844a 100644
--- a/current/sdk_library/system/framework-wifi.srcjar
+++ b/current/sdk_library/system/framework-wifi.srcjar
Binary files differ
diff --git a/current/sdk_library/system/framework-wifi.txt b/current/sdk_library/system/framework-wifi.txt
index 67d3b9a..ee9b214 100644
--- a/current/sdk_library/system/framework-wifi.txt
+++ b/current/sdk_library/system/framework-wifi.txt
@@ -27,6 +27,19 @@
     field public static final int EASY_CONNECT_EVENT_SUCCESS_CONFIGURATION_SENT = 0; // 0x0
   }
 
+  public final class OuiKeyedData implements android.os.Parcelable {
+    method public int describeContents();
+    method @NonNull public android.os.Parcelable getData();
+    method public int getOui();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.OuiKeyedData> CREATOR;
+  }
+
+  public static final class OuiKeyedData.Builder {
+    ctor public OuiKeyedData.Builder(int, @NonNull android.os.Parcelable);
+    method @NonNull public android.net.wifi.OuiKeyedData build();
+  }
+
   public final class QosPolicyParams implements android.os.Parcelable {
     method @Nullable public java.net.InetAddress getDestinationAddress();
     method @IntRange(from=android.net.wifi.QosPolicyParams.DESTINATION_PORT_ANY, to=65535) public int getDestinationPort();
@@ -339,6 +352,7 @@
     method public int getMaxNumberOfClients();
     method @NonNull public android.net.MacAddress getPersistentRandomizedMacAddress();
     method public long getShutdownTimeoutMillis();
+    method @NonNull public java.util.List<android.net.wifi.OuiKeyedData> getVendorData();
     method @NonNull public java.util.List<android.net.wifi.ScanResult.InformationElement> getVendorElements();
     method public boolean isAutoShutdownEnabled();
     method public boolean isBridgedModeOpportunisticShutdownEnabled();
@@ -383,6 +397,7 @@
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setPassphrase(@Nullable String, int);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setShutdownTimeoutMillis(@IntRange(from=0xffffffff) long);
     method @Deprecated @NonNull public android.net.wifi.SoftApConfiguration.Builder setSsid(@Nullable String);
+    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setVendorData(@NonNull java.util.List<android.net.wifi.OuiKeyedData>);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setVendorElements(@NonNull java.util.List<android.net.wifi.ScanResult.InformationElement>);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setWifiSsid(@Nullable android.net.wifi.WifiSsid);
   }
@@ -505,6 +520,7 @@
     field @Deprecated public static final int DISABLED_NO_INTERNET_PERMANENT = 6; // 0x6
     field @Deprecated public static final int DISABLED_NO_INTERNET_TEMPORARY = 4; // 0x4
     field @Deprecated public static final int DISABLED_TRANSITION_DISABLE_INDICATION = 13; // 0xd
+    field @Deprecated public static final int DISABLED_UNWANTED_LOW_RSSI = 14; // 0xe
     field @Deprecated public static final int NETWORK_SELECTION_ENABLED = 0; // 0x0
     field @Deprecated public static final int NETWORK_SELECTION_PERMANENTLY_DISABLED = 2; // 0x2
     field @Deprecated public static final int NETWORK_SELECTION_TEMPORARY_DISABLED = 1; // 0x1
@@ -577,6 +593,7 @@
   public class WifiManager {
     method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public void addOnWifiUsabilityStatsListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.OnWifiUsabilityStatsListener);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}) public void addQosPolicies(@NonNull java.util.List<android.net.wifi.QosPolicyParams>, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<java.lang.Integer>>);
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}) public void addWifiLowLatencyLockListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.WifiLowLatencyLockListener);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void addWifiNetworkStateChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.WifiNetworkStateChangedListener);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void addWifiVerboseLoggingStatusChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.WifiVerboseLoggingStatusChangedListener);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void allowAutojoin(int, boolean);
@@ -600,6 +617,8 @@
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,java.util.List<android.net.wifi.ScanResult>> getMatchingOsuProviders(@Nullable java.util.List<android.net.wifi.ScanResult>);
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,android.net.wifi.hotspot2.PasspointConfiguration> getMatchingPasspointConfigsForOsuProviders(@NonNull java.util.Set<android.net.wifi.hotspot2.OsuProvider>);
     method @NonNull @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE}) public java.util.Map<android.net.wifi.WifiNetworkSuggestion,java.util.List<android.net.wifi.ScanResult>> getMatchingScanResults(@NonNull java.util.List<android.net.wifi.WifiNetworkSuggestion>, @Nullable java.util.List<android.net.wifi.ScanResult>);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void getMaxMloAssociationLinkCount(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void getMaxMloStrLinkCount(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
     method public static int getMaxNumberOfPoliciesPerQosRequest();
     method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void getMloMode(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}) public void getNetworkSelectionConfig(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.net.wifi.WifiNetworkSelectionConfig>);
@@ -608,6 +627,7 @@
     method @Nullable @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.READ_WIFI_CREDENTIAL}, conditional=true) public android.net.wifi.WifiConfiguration getPrivilegedConnectedNetwork();
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public android.net.wifi.SoftApConfiguration getSoftApConfiguration();
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}, conditional=true) public java.util.Set<android.net.wifi.WifiSsid> getSsidsAllowlist();
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void getSupportedSimultaneousBandCombinations(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<int[]>>);
     method public int getVerboseLoggingLevel();
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void getWifiActivityEnergyInfoAsync(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.OnWifiActivityEnergyInfoListener);
     method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.WifiConfiguration getWifiApConfiguration();
@@ -616,6 +636,7 @@
     method public boolean isApMacRandomizationSupported();
     method public boolean isConnectedMacRandomizationSupported();
     method @Deprecated public boolean isDeviceToDeviceRttSupported();
+    method public boolean isLowLatencyModeSupported();
     method public boolean isPortableHotspotSupported();
     method public boolean isStaConcurrencyForRestrictedConnectionsSupported();
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean isThirdPartyAppEnablingWifiConfirmationDialogEnabled();
@@ -635,6 +656,7 @@
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void removeAppState(int, @NonNull String);
     method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public void removeOnWifiUsabilityStatsListener(@NonNull android.net.wifi.WifiManager.OnWifiUsabilityStatsListener);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}) public void removeQosPolicies(@NonNull int[]);
+    method public void removeWifiLowLatencyLockListener(@NonNull android.net.wifi.WifiManager.WifiLowLatencyLockListener);
     method public void removeWifiNetworkStateChangedListener(@NonNull android.net.wifi.WifiManager.WifiNetworkStateChangedListener);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void removeWifiVerboseLoggingStatusChangedListener(@NonNull android.net.wifi.WifiManager.WifiVerboseLoggingStatusChangedListener);
     method @RequiresPermission(android.Manifest.permission.RESTART_WIFI_SUBSYSTEM) public void restartWifiSubsystem();
@@ -657,6 +679,7 @@
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}) public void setOneShotScreenOnConnectivityScanDelayMillis(@IntRange(from=0) int);
     method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_COUNTRY_CODE) public void setOverrideCountryCode(@NonNull String);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setPasspointMeteredOverride(@NonNull String, int);
+    method @FlaggedApi("com.android.wifi.flags.runtime_disable_pno_scan") @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION, android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void setPnoScanEnabled(boolean, boolean);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setScanAlwaysAvailable(boolean);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setScanThrottleEnabled(boolean);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}) public void setScreenOnScanSchedule(@Nullable java.util.List<android.net.wifi.WifiManager.ScreenOnScanSchedule>);
@@ -664,8 +687,8 @@
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}, conditional=true) public void setSsidsAllowlist(@NonNull java.util.Set<android.net.wifi.WifiSsid>);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean setStaConcurrencyForMultiInternetMode(int);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void setThirdPartyAppEnablingWifiConfirmationDialogEnabled(boolean);
-    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setVerboseLoggingEnabled(boolean);
-    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setVerboseLoggingLevel(int);
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.DUMP}) public void setVerboseLoggingEnabled(boolean);
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.DUMP}) public void setVerboseLoggingLevel(int);
     method @Deprecated @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);
     method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public boolean setWifiConnectedNetworkScorer(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.WifiConnectedNetworkScorer);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void setWifiPasspointEnabled(boolean);
@@ -719,6 +742,7 @@
     field public static final int API_SCANNING_ENABLED = 1; // 0x1
     field public static final int API_SET_NETWORK_SELECTION_CONFIG = 8; // 0x8
     field public static final int API_SET_ONE_SHOT_SCREEN_ON_CONNECTIVITY_SCAN_DELAY = 7; // 0x7
+    field public static final int API_SET_PNO_SCAN_ENABLED = 36; // 0x24
     field public static final int API_SET_SCAN_SCHEDULE = 6; // 0x6
     field public static final int API_SET_TDLS_ENABLED = 34; // 0x22
     field public static final int API_SET_TDLS_ENABLED_WITH_MAC_ADDRESS = 35; // 0x23
@@ -786,6 +810,7 @@
     field public static final int VERBOSE_LOGGING_LEVEL_DISABLED = 0; // 0x0
     field public static final int VERBOSE_LOGGING_LEVEL_ENABLED = 1; // 0x1
     field public static final int VERBOSE_LOGGING_LEVEL_ENABLED_SHOW_KEY = 2; // 0x2
+    field public static final int VERBOSE_LOGGING_LEVEL_WIFI_AWARE_ENABLED_ONLY = 3; // 0x3
     field @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public static final String WIFI_AP_STATE_CHANGED_ACTION = "android.net.wifi.WIFI_AP_STATE_CHANGED";
     field public static final int WIFI_AP_STATE_DISABLED = 11; // 0xb
     field public static final int WIFI_AP_STATE_DISABLING = 10; // 0xa
@@ -893,6 +918,12 @@
     method public void onStop(int);
   }
 
+  public static interface WifiManager.WifiLowLatencyLockListener {
+    method public void onActivatedStateChanged(boolean);
+    method public default void onActiveUsersChanged(@NonNull int[]);
+    method public default void onOwnershipChanged(@NonNull int[]);
+  }
+
   public static interface WifiManager.WifiNetworkStateChangedListener {
     method public void onWifiNetworkStateChanged(int, int);
     field public static final int WIFI_NETWORK_STATUS_AUTHENTICATING = 4; // 0x4
@@ -1150,10 +1181,12 @@
     method public long getTotalBeaconRx();
     method public long getTotalBeaconRx(int);
     method public long getTotalCcaBusyFreqTimeMillis();
+    method public long getTotalCcaBusyFreqTimeMillis(int);
     method public long getTotalHotspot2ScanTimeMillis();
     method public long getTotalNanScanTimeMillis();
     method public long getTotalPnoScanTimeMillis();
     method public long getTotalRadioOnFreqTimeMillis();
+    method public long getTotalRadioOnFreqTimeMillis(int);
     method public long getTotalRadioOnTimeMillis();
     method public long getTotalRadioRxTimeMillis();
     method public long getTotalRadioTxTimeMillis();
diff --git a/current/sdk_library/system/framework-wifi_annotations.zip b/current/sdk_library/system/framework-wifi_annotations.zip
index 7ebe58e..af044cf 100644
--- a/current/sdk_library/system/framework-wifi_annotations.zip
+++ b/current/sdk_library/system/framework-wifi_annotations.zip
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 5c5472a..fffc196 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-11131767
\ No newline at end of file
+10917791
\ No newline at end of file
diff --git a/go/current/hiddenapi/filtered-flags.csv b/go/current/hiddenapi/filtered-flags.csv
index c252b6a..e562d90 100644
--- a/go/current/hiddenapi/filtered-flags.csv
+++ b/go/current/hiddenapi/filtered-flags.csv
@@ -422,6 +422,18 @@
 Landroid/net/wifi/MloLink;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/MloLink;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/MloLink;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$Builder;-><init>(ILandroid/os/Parcelable;)V,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$Builder;->build()Landroid/net/wifi/OuiKeyedData;,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->getData()Landroid/os/Parcelable;,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->getOui()I,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ParcelUtil;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/ParcelUtil;->readCertificate(Landroid/os/Parcel;)Ljava/security/cert/X509Certificate;,lo-prio,max-target-o
 Landroid/net/wifi/ParcelUtil;->readCertificates(Landroid/os/Parcel;)[Ljava/security/cert/X509Certificate;,lo-prio,max-target-o
@@ -876,6 +888,7 @@
 Landroid/net/wifi/SoftApConfiguration$Builder;->setPassphrase(Ljava/lang/String;I)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setShutdownTimeoutMillis(J)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setSsid(Ljava/lang/String;)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder;->setVendorData(Ljava/util/List;)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setVendorElements(Ljava/util/List;)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setWifiSsid(Landroid/net/wifi/WifiSsid;)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->BAND_2GHZ:I,sdk,system-api,test-api
@@ -912,6 +925,7 @@
 Landroid/net/wifi/SoftApConfiguration;->getSecurityType()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getShutdownTimeoutMillis()J,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getSsid()Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getVendorData()Ljava/util/List;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getVendorElements()Ljava/util/List;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getWifiSsid()Landroid/net/wifi/WifiSsid;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
@@ -1009,28 +1023,28 @@
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda11;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda12;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda12;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda15;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda16;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda1;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda22;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda24;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -1097,6 +1111,7 @@
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_NO_INTERNET_PERMANENT:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_NO_INTERNET_TEMPORARY:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_TRANSITION_DISABLE_INDICATION:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_UNWANTED_LOW_RSSI:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->INVALID_NETWORK_SELECTION_DISABLE_TIMESTAMP:J,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_DISABLED_MAX:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_DISABLED_STARTING_INDEX:I,lo-prio,max-target-o
@@ -1859,6 +1874,9 @@
 Landroid/net/wifi/WifiManager$WifiLock;->setReferenceCounted(Z)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiLock;->setWorkSource(Landroid/os/WorkSource;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiLock;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;->onActivatedStateChanged(Z)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;->onActiveUsersChanged([I)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;->onOwnershipChanged([I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;->WIFI_NETWORK_STATUS_AUTHENTICATING:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;->WIFI_NETWORK_STATUS_CONNECTED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;->WIFI_NETWORK_STATUS_CONNECTING:I,sdk,system-api,test-api
@@ -1917,6 +1935,7 @@
 Landroid/net/wifi/WifiManager;->API_SCANNING_ENABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_NETWORK_SELECTION_CONFIG:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_ONE_SHOT_SCREEN_ON_CONNECTIVITY_SCAN_DELAY:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_SET_PNO_SCAN_ENABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_SCAN_SCHEDULE:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_TDLS_ENABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_TDLS_ENABLED_WITH_MAC_ADDRESS:I,sdk,system-api,test-api
@@ -2051,6 +2070,7 @@
 Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_DISABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_ENABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_ENABLED_SHOW_KEY:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_WIFI_AWARE_ENABLED_ONLY:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_AP_STATE_CHANGED_ACTION:Ljava/lang/String;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_AP_STATE_DISABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_AP_STATE_DISABLING:I,sdk,system-api,test-api
@@ -2096,6 +2116,7 @@
 Landroid/net/wifi/WifiManager;->addQosPolicies(Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->addSuggestionConnectionStatusListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->addSuggestionUserApprovalStatusListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListener;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->addWifiLowLatencyLockListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->addWifiNetworkStateChangedListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->addWifiVerboseLoggingStatusChangedListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->allowAutojoin(IZ)V,sdk,system-api,test-api
@@ -2141,6 +2162,8 @@
 Landroid/net/wifi/WifiManager;->getMatchingOsuProviders(Ljava/util/List;)Ljava/util/Map;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMatchingPasspointConfigsForOsuProviders(Ljava/util/Set;)Ljava/util/Map;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMatchingScanResults(Ljava/util/List;Ljava/util/List;)Ljava/util/Map;,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->getMaxMloAssociationLinkCount(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->getMaxMloStrLinkCount(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMaxNumberOfChannelsPerNetworkSpecifierRequest()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMaxNumberOfNetworkSuggestionsPerApp()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMaxNumberOfPoliciesPerQosRequest()I,sdk,system-api,test-api
@@ -2158,6 +2181,7 @@
 Landroid/net/wifi/WifiManager;->getSoftApConfiguration()Landroid/net/wifi/SoftApConfiguration;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getSsidsAllowlist()Ljava/util/Set;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getStaConcurrencyForMultiInternetMode()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->getSupportedSimultaneousBandCombinations(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getUsableChannels(II)Ljava/util/List;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getVerboseLoggingLevel()I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getWifiActivityEnergyInfoAsync(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoListener;)V,sdk,system-api,test-api
@@ -2184,6 +2208,7 @@
 Landroid/net/wifi/WifiManager;->isEasyConnectSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isEnhancedOpenSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isEnhancedPowerReportingSupported()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->isLowLatencyModeSupported()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isMakeBeforeBreakWifiSwitchingSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isMulticastEnabled()Z,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->isOffChannelTdlsSupported()Z,lo-prio,max-target-o
@@ -2256,6 +2281,7 @@
 Landroid/net/wifi/WifiManager;->removeQosPolicies([I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeSuggestionConnectionStatusListener(Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeSuggestionUserApprovalStatusListener(Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListener;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->removeWifiLowLatencyLockListener(Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeWifiNetworkStateChangedListener(Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->reportCreateInterfaceImpact(IZLjava/util/concurrent/Executor;Ljava/util/function/BiConsumer;)V,public-api,sdk,system-api,test-api
@@ -2281,6 +2307,7 @@
 Landroid/net/wifi/WifiManager;->setOneShotScreenOnConnectivityScanDelayMillis(I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setOverrideCountryCode(Ljava/lang/String;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setPasspointMeteredOverride(Ljava/lang/String;I)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->setPnoScanEnabled(ZZ)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setScanAlwaysAvailable(Z)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setScanThrottleEnabled(Z)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setScreenOnScanSchedule(Ljava/util/List;)V,sdk,system-api,test-api
@@ -2810,10 +2837,12 @@
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalBeaconRx()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalBeaconRx(I)J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalCcaBusyFreqTimeMillis()J,sdk,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalCcaBusyFreqTimeMillis(I)J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalHotspot2ScanTimeMillis()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalNanScanTimeMillis()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalPnoScanTimeMillis()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioOnFreqTimeMillis()J,sdk,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioOnFreqTimeMillis(I)J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioOnTimeMillis()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioRxTimeMillis()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioTxTimeMillis()J,sdk,system-api,test-api
diff --git a/go/current/hiddenapi/filtered-stub-flags.csv b/go/current/hiddenapi/filtered-stub-flags.csv
index 042e506..2da3a99 100644
--- a/go/current/hiddenapi/filtered-stub-flags.csv
+++ b/go/current/hiddenapi/filtered-stub-flags.csv
@@ -207,6 +207,18 @@
 Landroid/net/wifi/MloLink;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/MloLink;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/MloLink;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$Builder;-><init>(ILandroid/os/Parcelable;)V,system-api,test-api
+Landroid/net/wifi/OuiKeyedData$Builder;->build()Landroid/net/wifi/OuiKeyedData;,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->describeContents()I,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->getData()Landroid/os/Parcelable;,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->getOui()I,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/OuiKeyedData;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/wifi/QosPolicyParams$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/QosPolicyParams$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/QosPolicyParams$Builder;-><init>(II)V,system-api,test-api
@@ -596,6 +608,7 @@
 Landroid/net/wifi/SoftApConfiguration$Builder;->setPassphrase(Ljava/lang/String;I)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setShutdownTimeoutMillis(J)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setSsid(Ljava/lang/String;)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder;->setVendorData(Ljava/util/List;)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setVendorElements(Ljava/util/List;)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setWifiSsid(Landroid/net/wifi/WifiSsid;)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->BAND_2GHZ:I,system-api,test-api
@@ -632,6 +645,7 @@
 Landroid/net/wifi/SoftApConfiguration;->getSecurityType()I,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getShutdownTimeoutMillis()J,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getSsid()Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getVendorData()Ljava/util/List;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getVendorElements()Ljava/util/List;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getWifiSsid()Landroid/net/wifi/WifiSsid;,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->hashCode()I,core-platform-api,public-api,system-api,test-api
@@ -725,28 +739,28 @@
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda11;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda12;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda12;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda15;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda16;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda1;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda22;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda24;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
@@ -806,6 +820,7 @@
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_NO_INTERNET_PERMANENT:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_NO_INTERNET_TEMPORARY:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_TRANSITION_DISABLE_INDICATION:I,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->DISABLED_UNWANTED_LOW_RSSI:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_ENABLED:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_PERMANENTLY_DISABLED:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->NETWORK_SELECTION_TEMPORARY_DISABLED:I,system-api,test-api
@@ -1336,6 +1351,9 @@
 Landroid/net/wifi/WifiManager$WifiLock;->setReferenceCounted(Z)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiLock;->setWorkSource(Landroid/os/WorkSource;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiLock;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;->onActivatedStateChanged(Z)V,system-api,test-api
+Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;->onActiveUsersChanged([I)V,system-api,test-api
+Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;->onOwnershipChanged([I)V,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;->WIFI_NETWORK_STATUS_AUTHENTICATING:I,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;->WIFI_NETWORK_STATUS_CONNECTED:I,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;->WIFI_NETWORK_STATUS_CONNECTING:I,system-api,test-api
@@ -1389,6 +1407,7 @@
 Landroid/net/wifi/WifiManager;->API_SCANNING_ENABLED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_NETWORK_SELECTION_CONFIG:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_ONE_SHOT_SCREEN_ON_CONNECTIVITY_SCAN_DELAY:I,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_SET_PNO_SCAN_ENABLED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_SCAN_SCHEDULE:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_TDLS_ENABLED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->API_SET_TDLS_ENABLED_WITH_MAC_ADDRESS:I,system-api,test-api
@@ -1502,6 +1521,7 @@
 Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_DISABLED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_ENABLED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_ENABLED_SHOW_KEY:I,system-api,test-api
+Landroid/net/wifi/WifiManager;->VERBOSE_LOGGING_LEVEL_WIFI_AWARE_ENABLED_ONLY:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_AP_STATE_CHANGED_ACTION:Ljava/lang/String;,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_AP_STATE_DISABLED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_AP_STATE_DISABLING:I,system-api,test-api
@@ -1542,6 +1562,7 @@
 Landroid/net/wifi/WifiManager;->addQosPolicies(Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->addSuggestionConnectionStatusListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->addSuggestionUserApprovalStatusListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListener;)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->addWifiLowLatencyLockListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->addWifiNetworkStateChangedListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->addWifiVerboseLoggingStatusChangedListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->allowAutojoin(IZ)V,system-api,test-api
@@ -1583,6 +1604,8 @@
 Landroid/net/wifi/WifiManager;->getMatchingOsuProviders(Ljava/util/List;)Ljava/util/Map;,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMatchingPasspointConfigsForOsuProviders(Ljava/util/Set;)Ljava/util/Map;,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMatchingScanResults(Ljava/util/List;Ljava/util/List;)Ljava/util/Map;,system-api,test-api
+Landroid/net/wifi/WifiManager;->getMaxMloAssociationLinkCount(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,system-api,test-api
+Landroid/net/wifi/WifiManager;->getMaxMloStrLinkCount(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMaxNumberOfChannelsPerNetworkSpecifierRequest()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMaxNumberOfNetworkSuggestionsPerApp()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->getMaxNumberOfPoliciesPerQosRequest()I,system-api,test-api
@@ -1600,6 +1623,7 @@
 Landroid/net/wifi/WifiManager;->getSoftApConfiguration()Landroid/net/wifi/SoftApConfiguration;,system-api,test-api
 Landroid/net/wifi/WifiManager;->getSsidsAllowlist()Ljava/util/Set;,system-api,test-api
 Landroid/net/wifi/WifiManager;->getStaConcurrencyForMultiInternetMode()I,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->getSupportedSimultaneousBandCombinations(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->getUsableChannels(II)Ljava/util/List;,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->getVerboseLoggingLevel()I,system-api,test-api
 Landroid/net/wifi/WifiManager;->getWifiActivityEnergyInfoAsync(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoListener;)V,system-api,test-api
@@ -1625,6 +1649,7 @@
 Landroid/net/wifi/WifiManager;->isEasyConnectSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isEnhancedOpenSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isEnhancedPowerReportingSupported()Z,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->isLowLatencyModeSupported()Z,system-api,test-api
 Landroid/net/wifi/WifiManager;->isMakeBeforeBreakWifiSwitchingSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isP2pSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isPasspointTermsAndConditionsSupported()Z,public-api,system-api,test-api
@@ -1683,6 +1708,7 @@
 Landroid/net/wifi/WifiManager;->removeQosPolicies([I)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeSuggestionConnectionStatusListener(Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeSuggestionUserApprovalStatusListener(Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListener;)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->removeWifiLowLatencyLockListener(Landroid/net/wifi/WifiManager$WifiLowLatencyLockListener;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeWifiNetworkStateChangedListener(Landroid/net/wifi/WifiManager$WifiNetworkStateChangedListener;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->reportCreateInterfaceImpact(IZLjava/util/concurrent/Executor;Ljava/util/function/BiConsumer;)V,public-api,system-api,test-api
@@ -1707,6 +1733,7 @@
 Landroid/net/wifi/WifiManager;->setOneShotScreenOnConnectivityScanDelayMillis(I)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->setOverrideCountryCode(Ljava/lang/String;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->setPasspointMeteredOverride(Ljava/lang/String;I)V,system-api,test-api
+Landroid/net/wifi/WifiManager;->setPnoScanEnabled(ZZ)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->setScanAlwaysAvailable(Z)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->setScanThrottleEnabled(Z)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->setScreenOnScanSchedule(Ljava/util/List;)V,system-api,test-api
@@ -2165,10 +2192,12 @@
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalBeaconRx()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalBeaconRx(I)J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalCcaBusyFreqTimeMillis()J,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalCcaBusyFreqTimeMillis(I)J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalHotspot2ScanTimeMillis()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalNanScanTimeMillis()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalPnoScanTimeMillis()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioOnFreqTimeMillis()J,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioOnFreqTimeMillis(I)J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioOnTimeMillis()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioRxTimeMillis()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->getTotalRadioTxTimeMillis()J,system-api,test-api
diff --git a/go/current/hiddenapi/index.csv b/go/current/hiddenapi/index.csv
index c27f7b1..fafddb7 100644
--- a/go/current/hiddenapi/index.csv
+++ b/go/current/hiddenapi/index.csv
@@ -38,47 +38,47 @@
 Landroid/net/wifi/WifiConfiguration;->numNoInternetAccessReports:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1446,5,1446,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/wifi/WifiConfiguration;->noInternetAccessExpected:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1464,5,1464,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/wifi/WifiConfiguration;->selfAdded:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1526,5,1526,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiConfiguration;->isEnterprise()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3280,5,3280,25,
-Landroid/net/wifi/WifiConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3784,5,3784,25,
-Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3790,5,3790,25,
-Landroid/net/wifi/WifiConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3800,5,3800,25,
-Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3806,5,3806,25,
-Landroid/net/wifi/WifiConfiguration;->getProxySettings()Landroid/net/IpConfiguration$ProxySettings;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3816,5,3816,25,
-Landroid/net/wifi/WifiConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3822,5,3822,25,
-Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3882,5,3882,25,
-Landroid/net/wifi/WifiEnterpriseConfig;->mFields:Ljava/util/HashMap;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,334,5,334,25,
-Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateAlias(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,909,5,909,25,
-Landroid/net/wifi/WifiEnterpriseConfig;->getCaCertificateAlias()Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,960,5,960,25,
-Landroid/net/wifi/WifiInfo;->mBSSID:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,114,5,114,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/wifi/WifiInfo;->mWifiSsid:Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,116,5,116,25,
-Landroid/net/wifi/WifiInfo;->mIpAddress:Ljava/net/InetAddress;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,261,5,261,25,
-Landroid/net/wifi/WifiInfo;->mMacAddress:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,263,5,263,25,
-Landroid/net/wifi/WifiInfo;->score:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,425,5,425,25,
-Landroid/net/wifi/WifiInfo;-><init>()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,490,5,490,25,
-Landroid/net/wifi/WifiInfo;->getWifiSsid()Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,783,5,783,25,
-Landroid/net/wifi/WifiInfo;->setBSSID(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,789,5,789,25,
-Landroid/net/wifi/WifiInfo;->setRssi(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,967,5,967,25,
-Landroid/net/wifi/WifiInfo;->setLinkSpeed(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1013,5,1013,25,
-Landroid/net/wifi/WifiInfo;->is5GHz()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1119,5,1119,25,
-Landroid/net/wifi/WifiInfo;->setMacAddress(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1136,5,1136,25,
-Landroid/net/wifi/WifiInfo;->getMeteredHint()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1176,5,1176,25,
-Landroid/net/wifi/WifiInfo;->setNetworkId(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1380,5,1380,25,
-Landroid/net/wifi/WifiInfo;->setSupplicantState(Landroid/net/wifi/SupplicantState;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1409,5,1409,25,
-Landroid/net/wifi/WifiInfo;->setSupplicantState(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1465,5,1465,25,
-Landroid/net/wifi/WifiInfo;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1494,5,1494,25,
-Landroid/net/wifi/WifiInfo;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1638,5,1638,25,
-Landroid/net/wifi/WifiManager;->LINK_CONFIGURATION_CHANGED_ACTION:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1638,5,1638,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiManager;->MIN_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1843,5,1843,25,
-Landroid/net/wifi/WifiManager;->MAX_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1847,5,1847,25,
-Landroid/net/wifi/WifiManager;->RSSI_LEVELS:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1857,5,1857,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_AUTO:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1866,5,1866,25,
-Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_5GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1873,5,1873,25,
-Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_2GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1880,5,1880,25,
-Landroid/net/wifi/WifiManager;->mActiveLockCount:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,2009,5,2009,25,
-Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,2013,5,2013,25,
-Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,5768,5,5768,25,
-Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,8198,5,8198,25,
-Landroid/net/wifi/WifiManager;->enableVerboseLogging(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,8238,5,8241,6,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+%23setVerboseLoggingEnabled%28boolean%29%7D+instead.%22
+Landroid/net/wifi/WifiConfiguration;->isEnterprise()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3279,5,3279,25,
+Landroid/net/wifi/WifiConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3783,5,3783,25,
+Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3789,5,3789,25,
+Landroid/net/wifi/WifiConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3799,5,3799,25,
+Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3805,5,3805,25,
+Landroid/net/wifi/WifiConfiguration;->getProxySettings()Landroid/net/IpConfiguration$ProxySettings;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3815,5,3815,25,
+Landroid/net/wifi/WifiConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3821,5,3821,25,
+Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3881,5,3881,25,
+Landroid/net/wifi/WifiEnterpriseConfig;->mFields:Ljava/util/HashMap;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,396,5,396,25,
+Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateAlias(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,979,5,979,25,
+Landroid/net/wifi/WifiEnterpriseConfig;->getCaCertificateAlias()Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,1030,5,1030,25,
+Landroid/net/wifi/WifiInfo;->mBSSID:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,115,5,115,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/wifi/WifiInfo;->mWifiSsid:Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,117,5,117,25,
+Landroid/net/wifi/WifiInfo;->mIpAddress:Ljava/net/InetAddress;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,265,5,265,25,
+Landroid/net/wifi/WifiInfo;->mMacAddress:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,267,5,267,25,
+Landroid/net/wifi/WifiInfo;->score:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,429,5,429,25,
+Landroid/net/wifi/WifiInfo;-><init>()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,494,5,494,25,
+Landroid/net/wifi/WifiInfo;->getWifiSsid()Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,787,5,787,25,
+Landroid/net/wifi/WifiInfo;->setBSSID(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,793,5,793,25,
+Landroid/net/wifi/WifiInfo;->setRssi(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,984,5,984,25,
+Landroid/net/wifi/WifiInfo;->setLinkSpeed(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1030,5,1030,25,
+Landroid/net/wifi/WifiInfo;->is5GHz()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1136,5,1136,25,
+Landroid/net/wifi/WifiInfo;->setMacAddress(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1153,5,1153,25,
+Landroid/net/wifi/WifiInfo;->getMeteredHint()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1193,5,1193,25,
+Landroid/net/wifi/WifiInfo;->setNetworkId(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1397,5,1397,25,
+Landroid/net/wifi/WifiInfo;->setSupplicantState(Landroid/net/wifi/SupplicantState;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1426,5,1426,25,
+Landroid/net/wifi/WifiInfo;->setSupplicantState(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1482,5,1482,25,
+Landroid/net/wifi/WifiInfo;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1511,5,1511,25,
+Landroid/net/wifi/WifiInfo;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1655,5,1655,25,
+Landroid/net/wifi/WifiManager;->LINK_CONFIGURATION_CHANGED_ACTION:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1639,5,1639,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiManager;->MIN_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1844,5,1844,25,
+Landroid/net/wifi/WifiManager;->MAX_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1848,5,1848,25,
+Landroid/net/wifi/WifiManager;->RSSI_LEVELS:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1858,5,1858,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_AUTO:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1867,5,1867,25,
+Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_5GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1874,5,1874,25,
+Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_2GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1881,5,1881,25,
+Landroid/net/wifi/WifiManager;->mActiveLockCount:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,2010,5,2010,25,
+Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,2014,5,2014,25,
+Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,5778,5,5778,25,
+Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,8212,5,8212,25,
+Landroid/net/wifi/WifiManager;->enableVerboseLogging(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,8258,5,8261,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,206,5,206,69,publicAlternatives=%22%7B%40link+%23getBytes%28%29%7D%22
 Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,214,5,214,99,publicAlternatives=%22%7B%40link+android.net.wifi.WifiManager%23UNKNOWN_SSID%7D%22
 Landroid/net/wifi/WifiSsid;->createFromAsciiEncoded(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,222,5,222,76,publicAlternatives=%22%7B%40link+%23fromBytes%28byte%5B%5D%29%7D%22
diff --git a/go/current/hiddenapi/signature-patterns.csv b/go/current/hiddenapi/signature-patterns.csv
index b26c8e4..d6de6c5 100644
--- a/go/current/hiddenapi/signature-patterns.csv
+++ b/go/current/hiddenapi/signature-patterns.csv
@@ -39,6 +39,7 @@
 android/net/wifi/IWifiScannerListener
 android/net/wifi/IWifiVerboseLoggingStatusChangedListener
 android/net/wifi/MloLink
+android/net/wifi/OuiKeyedData
 android/net/wifi/ParcelUtil
 android/net/wifi/QosPolicyParams
 android/net/wifi/RttManager
diff --git a/go/current/sdk_library/module-lib/framework-wifi-stubs.jar b/go/current/sdk_library/module-lib/framework-wifi-stubs.jar
index 60427e0..695893d 100644
--- a/go/current/sdk_library/module-lib/framework-wifi-stubs.jar
+++ b/go/current/sdk_library/module-lib/framework-wifi-stubs.jar
Binary files differ
diff --git a/go/current/sdk_library/module-lib/framework-wifi.srcjar b/go/current/sdk_library/module-lib/framework-wifi.srcjar
index fd9fb6d..01097a9 100644
--- a/go/current/sdk_library/module-lib/framework-wifi.srcjar
+++ b/go/current/sdk_library/module-lib/framework-wifi.srcjar
Binary files differ
diff --git a/go/current/sdk_library/module-lib/framework-wifi_annotations.zip b/go/current/sdk_library/module-lib/framework-wifi_annotations.zip
index 8bb2818..572088e 100644
--- a/go/current/sdk_library/module-lib/framework-wifi_annotations.zip
+++ b/go/current/sdk_library/module-lib/framework-wifi_annotations.zip
Binary files differ
diff --git a/go/current/sdk_library/public/framework-wifi-stubs.jar b/go/current/sdk_library/public/framework-wifi-stubs.jar
index cb0ff54..345812e 100644
--- a/go/current/sdk_library/public/framework-wifi-stubs.jar
+++ b/go/current/sdk_library/public/framework-wifi-stubs.jar
Binary files differ
diff --git a/go/current/sdk_library/public/framework-wifi.srcjar b/go/current/sdk_library/public/framework-wifi.srcjar
index 941a721..dbdf7fc 100644
--- a/go/current/sdk_library/public/framework-wifi.srcjar
+++ b/go/current/sdk_library/public/framework-wifi.srcjar
Binary files differ
diff --git a/go/current/sdk_library/system/framework-wifi-stubs.jar b/go/current/sdk_library/system/framework-wifi-stubs.jar
index 12deba5..8f444d0 100644
--- a/go/current/sdk_library/system/framework-wifi-stubs.jar
+++ b/go/current/sdk_library/system/framework-wifi-stubs.jar
Binary files differ
diff --git a/go/current/sdk_library/system/framework-wifi.srcjar b/go/current/sdk_library/system/framework-wifi.srcjar
index d88a6a6..2b4844a 100644
--- a/go/current/sdk_library/system/framework-wifi.srcjar
+++ b/go/current/sdk_library/system/framework-wifi.srcjar
Binary files differ
diff --git a/go/current/sdk_library/system/framework-wifi.txt b/go/current/sdk_library/system/framework-wifi.txt
index 67d3b9a..ee9b214 100644
--- a/go/current/sdk_library/system/framework-wifi.txt
+++ b/go/current/sdk_library/system/framework-wifi.txt
@@ -27,6 +27,19 @@
     field public static final int EASY_CONNECT_EVENT_SUCCESS_CONFIGURATION_SENT = 0; // 0x0
   }
 
+  public final class OuiKeyedData implements android.os.Parcelable {
+    method public int describeContents();
+    method @NonNull public android.os.Parcelable getData();
+    method public int getOui();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.OuiKeyedData> CREATOR;
+  }
+
+  public static final class OuiKeyedData.Builder {
+    ctor public OuiKeyedData.Builder(int, @NonNull android.os.Parcelable);
+    method @NonNull public android.net.wifi.OuiKeyedData build();
+  }
+
   public final class QosPolicyParams implements android.os.Parcelable {
     method @Nullable public java.net.InetAddress getDestinationAddress();
     method @IntRange(from=android.net.wifi.QosPolicyParams.DESTINATION_PORT_ANY, to=65535) public int getDestinationPort();
@@ -339,6 +352,7 @@
     method public int getMaxNumberOfClients();
     method @NonNull public android.net.MacAddress getPersistentRandomizedMacAddress();
     method public long getShutdownTimeoutMillis();
+    method @NonNull public java.util.List<android.net.wifi.OuiKeyedData> getVendorData();
     method @NonNull public java.util.List<android.net.wifi.ScanResult.InformationElement> getVendorElements();
     method public boolean isAutoShutdownEnabled();
     method public boolean isBridgedModeOpportunisticShutdownEnabled();
@@ -383,6 +397,7 @@
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setPassphrase(@Nullable String, int);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setShutdownTimeoutMillis(@IntRange(from=0xffffffff) long);
     method @Deprecated @NonNull public android.net.wifi.SoftApConfiguration.Builder setSsid(@Nullable String);
+    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setVendorData(@NonNull java.util.List<android.net.wifi.OuiKeyedData>);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setVendorElements(@NonNull java.util.List<android.net.wifi.ScanResult.InformationElement>);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setWifiSsid(@Nullable android.net.wifi.WifiSsid);
   }
@@ -505,6 +520,7 @@
     field @Deprecated public static final int DISABLED_NO_INTERNET_PERMANENT = 6; // 0x6
     field @Deprecated public static final int DISABLED_NO_INTERNET_TEMPORARY = 4; // 0x4
     field @Deprecated public static final int DISABLED_TRANSITION_DISABLE_INDICATION = 13; // 0xd
+    field @Deprecated public static final int DISABLED_UNWANTED_LOW_RSSI = 14; // 0xe
     field @Deprecated public static final int NETWORK_SELECTION_ENABLED = 0; // 0x0
     field @Deprecated public static final int NETWORK_SELECTION_PERMANENTLY_DISABLED = 2; // 0x2
     field @Deprecated public static final int NETWORK_SELECTION_TEMPORARY_DISABLED = 1; // 0x1
@@ -577,6 +593,7 @@
   public class WifiManager {
     method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public void addOnWifiUsabilityStatsListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.OnWifiUsabilityStatsListener);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}) public void addQosPolicies(@NonNull java.util.List<android.net.wifi.QosPolicyParams>, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<java.lang.Integer>>);
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}) public void addWifiLowLatencyLockListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.WifiLowLatencyLockListener);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void addWifiNetworkStateChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.WifiNetworkStateChangedListener);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void addWifiVerboseLoggingStatusChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.WifiVerboseLoggingStatusChangedListener);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void allowAutojoin(int, boolean);
@@ -600,6 +617,8 @@
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,java.util.List<android.net.wifi.ScanResult>> getMatchingOsuProviders(@Nullable java.util.List<android.net.wifi.ScanResult>);
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,android.net.wifi.hotspot2.PasspointConfiguration> getMatchingPasspointConfigsForOsuProviders(@NonNull java.util.Set<android.net.wifi.hotspot2.OsuProvider>);
     method @NonNull @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE}) public java.util.Map<android.net.wifi.WifiNetworkSuggestion,java.util.List<android.net.wifi.ScanResult>> getMatchingScanResults(@NonNull java.util.List<android.net.wifi.WifiNetworkSuggestion>, @Nullable java.util.List<android.net.wifi.ScanResult>);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void getMaxMloAssociationLinkCount(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void getMaxMloStrLinkCount(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
     method public static int getMaxNumberOfPoliciesPerQosRequest();
     method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void getMloMode(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}) public void getNetworkSelectionConfig(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.net.wifi.WifiNetworkSelectionConfig>);
@@ -608,6 +627,7 @@
     method @Nullable @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.READ_WIFI_CREDENTIAL}, conditional=true) public android.net.wifi.WifiConfiguration getPrivilegedConnectedNetwork();
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public android.net.wifi.SoftApConfiguration getSoftApConfiguration();
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}, conditional=true) public java.util.Set<android.net.wifi.WifiSsid> getSsidsAllowlist();
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void getSupportedSimultaneousBandCombinations(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<int[]>>);
     method public int getVerboseLoggingLevel();
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void getWifiActivityEnergyInfoAsync(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.OnWifiActivityEnergyInfoListener);
     method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.WifiConfiguration getWifiApConfiguration();
@@ -616,6 +636,7 @@
     method public boolean isApMacRandomizationSupported();
     method public boolean isConnectedMacRandomizationSupported();
     method @Deprecated public boolean isDeviceToDeviceRttSupported();
+    method public boolean isLowLatencyModeSupported();
     method public boolean isPortableHotspotSupported();
     method public boolean isStaConcurrencyForRestrictedConnectionsSupported();
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean isThirdPartyAppEnablingWifiConfirmationDialogEnabled();
@@ -635,6 +656,7 @@
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void removeAppState(int, @NonNull String);
     method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public void removeOnWifiUsabilityStatsListener(@NonNull android.net.wifi.WifiManager.OnWifiUsabilityStatsListener);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}) public void removeQosPolicies(@NonNull int[]);
+    method public void removeWifiLowLatencyLockListener(@NonNull android.net.wifi.WifiManager.WifiLowLatencyLockListener);
     method public void removeWifiNetworkStateChangedListener(@NonNull android.net.wifi.WifiManager.WifiNetworkStateChangedListener);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void removeWifiVerboseLoggingStatusChangedListener(@NonNull android.net.wifi.WifiManager.WifiVerboseLoggingStatusChangedListener);
     method @RequiresPermission(android.Manifest.permission.RESTART_WIFI_SUBSYSTEM) public void restartWifiSubsystem();
@@ -657,6 +679,7 @@
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}) public void setOneShotScreenOnConnectivityScanDelayMillis(@IntRange(from=0) int);
     method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_COUNTRY_CODE) public void setOverrideCountryCode(@NonNull String);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setPasspointMeteredOverride(@NonNull String, int);
+    method @FlaggedApi("com.android.wifi.flags.runtime_disable_pno_scan") @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION, android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void setPnoScanEnabled(boolean, boolean);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setScanAlwaysAvailable(boolean);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setScanThrottleEnabled(boolean);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}) public void setScreenOnScanSchedule(@Nullable java.util.List<android.net.wifi.WifiManager.ScreenOnScanSchedule>);
@@ -664,8 +687,8 @@
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION}, conditional=true) public void setSsidsAllowlist(@NonNull java.util.Set<android.net.wifi.WifiSsid>);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public boolean setStaConcurrencyForMultiInternetMode(int);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void setThirdPartyAppEnablingWifiConfirmationDialogEnabled(boolean);
-    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setVerboseLoggingEnabled(boolean);
-    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setVerboseLoggingLevel(int);
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.DUMP}) public void setVerboseLoggingEnabled(boolean);
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.DUMP}) public void setVerboseLoggingLevel(int);
     method @Deprecated @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);
     method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public boolean setWifiConnectedNetworkScorer(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.WifiConnectedNetworkScorer);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void setWifiPasspointEnabled(boolean);
@@ -719,6 +742,7 @@
     field public static final int API_SCANNING_ENABLED = 1; // 0x1
     field public static final int API_SET_NETWORK_SELECTION_CONFIG = 8; // 0x8
     field public static final int API_SET_ONE_SHOT_SCREEN_ON_CONNECTIVITY_SCAN_DELAY = 7; // 0x7
+    field public static final int API_SET_PNO_SCAN_ENABLED = 36; // 0x24
     field public static final int API_SET_SCAN_SCHEDULE = 6; // 0x6
     field public static final int API_SET_TDLS_ENABLED = 34; // 0x22
     field public static final int API_SET_TDLS_ENABLED_WITH_MAC_ADDRESS = 35; // 0x23
@@ -786,6 +810,7 @@
     field public static final int VERBOSE_LOGGING_LEVEL_DISABLED = 0; // 0x0
     field public static final int VERBOSE_LOGGING_LEVEL_ENABLED = 1; // 0x1
     field public static final int VERBOSE_LOGGING_LEVEL_ENABLED_SHOW_KEY = 2; // 0x2
+    field public static final int VERBOSE_LOGGING_LEVEL_WIFI_AWARE_ENABLED_ONLY = 3; // 0x3
     field @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public static final String WIFI_AP_STATE_CHANGED_ACTION = "android.net.wifi.WIFI_AP_STATE_CHANGED";
     field public static final int WIFI_AP_STATE_DISABLED = 11; // 0xb
     field public static final int WIFI_AP_STATE_DISABLING = 10; // 0xa
@@ -893,6 +918,12 @@
     method public void onStop(int);
   }
 
+  public static interface WifiManager.WifiLowLatencyLockListener {
+    method public void onActivatedStateChanged(boolean);
+    method public default void onActiveUsersChanged(@NonNull int[]);
+    method public default void onOwnershipChanged(@NonNull int[]);
+  }
+
   public static interface WifiManager.WifiNetworkStateChangedListener {
     method public void onWifiNetworkStateChanged(int, int);
     field public static final int WIFI_NETWORK_STATUS_AUTHENTICATING = 4; // 0x4
@@ -1150,10 +1181,12 @@
     method public long getTotalBeaconRx();
     method public long getTotalBeaconRx(int);
     method public long getTotalCcaBusyFreqTimeMillis();
+    method public long getTotalCcaBusyFreqTimeMillis(int);
     method public long getTotalHotspot2ScanTimeMillis();
     method public long getTotalNanScanTimeMillis();
     method public long getTotalPnoScanTimeMillis();
     method public long getTotalRadioOnFreqTimeMillis();
+    method public long getTotalRadioOnFreqTimeMillis(int);
     method public long getTotalRadioOnTimeMillis();
     method public long getTotalRadioRxTimeMillis();
     method public long getTotalRadioTxTimeMillis();
diff --git a/go/current/sdk_library/system/framework-wifi_annotations.zip b/go/current/sdk_library/system/framework-wifi_annotations.zip
index 7ebe58e..af044cf 100644
--- a/go/current/sdk_library/system/framework-wifi_annotations.zip
+++ b/go/current/sdk_library/system/framework-wifi_annotations.zip
Binary files differ
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index 5c5472a..fffc196 100644
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-11131767
\ No newline at end of file
+10917791
\ No newline at end of file