diff --git a/current/Android.bp b/current/Android.bp
index efc6ae3..666ba30 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,19 +1,29 @@
 // This is auto-generated. DO NOT EDIT.
 
+// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type {
+    name: "wifi_prebuilt_java_sdk_library_import",
+    module_type: "java_sdk_library_import",
+    config_namespace: "wifi_module",
+    bool_variables: ["source_build"],
+    properties: ["prefer"],
+}
+
+// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type {
+    name: "wifi_prebuilt_prebuilt_bootclasspath_fragment",
+    module_type: "prebuilt_bootclasspath_fragment",
+    config_namespace: "wifi_module",
+    bool_variables: ["source_build"],
+    properties: ["prefer"],
+}
+
 package {
     // A default list here prevents the license LSC from adding its own list which would
     // be unnecessary as every module in the sdk already has its own licenses property.
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-soong_config_module_type_import {
-    from: "packages/modules/common/Android.bp",
-    module_types: [
-        "module_java_sdk_library_import",
-        "module_prebuilt_bootclasspath_fragment",
-    ],
-}
-
 prebuilt_bootclasspath_fragment {
     name: "wifi-module-sdk_com.android.wifi-bootclasspath-fragment@current",
     sdk_member_name: "com.android.wifi-bootclasspath-fragment",
@@ -21,23 +31,30 @@
     apex_available: ["com.android.wifi"],
     licenses: ["wifi-module-sdk_Android-Apache-2.0@current"],
     contents: ["wifi-module-sdk_framework-wifi@current"],
+    fragments: [
+        {
+            apex: "com.android.art",
+            module: "art-bootclasspath-fragment",
+        },
+    ],
     hidden_api: {
         unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
         max_target_r_low_priority: ["hiddenapi/hiddenapi-max-target-r-low-priority.txt"],
         max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
-        stub_flags: "hiddenapi/stub-flags.csv",
         annotation_flags: "hiddenapi/annotation-flags.csv",
         metadata: "hiddenapi/metadata.csv",
         index: "hiddenapi/index.csv",
+        stub_flags: "hiddenapi/stub-flags.csv",
         all_flags: "hiddenapi/all-flags.csv",
     },
 }
 
-module_prebuilt_bootclasspath_fragment {
+wifi_prebuilt_prebuilt_bootclasspath_fragment {
     name: "com.android.wifi-bootclasspath-fragment",
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true.
     prefer: true,
     soong_config_variables: {
-        module_build_from_source: {
+        source_build: {
             prefer: false,
         },
     },
@@ -45,14 +62,20 @@
     apex_available: ["com.android.wifi"],
     licenses: ["wifi-module-sdk_Android-Apache-2.0"],
     contents: ["framework-wifi"],
+    fragments: [
+        {
+            apex: "com.android.art",
+            module: "art-bootclasspath-fragment",
+        },
+    ],
     hidden_api: {
         unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
         max_target_r_low_priority: ["hiddenapi/hiddenapi-max-target-r-low-priority.txt"],
         max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
-        stub_flags: "hiddenapi/stub-flags.csv",
         annotation_flags: "hiddenapi/annotation-flags.csv",
         metadata: "hiddenapi/metadata.csv",
         index: "hiddenapi/index.csv",
+        stub_flags: "hiddenapi/stub-flags.csv",
         all_flags: "hiddenapi/all-flags.csv",
     },
 }
@@ -95,11 +118,12 @@
     },
 }
 
-module_java_sdk_library_import {
+wifi_prebuilt_java_sdk_library_import {
     name: "framework-wifi",
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true.
     prefer: true,
     soong_config_variables: {
-        module_build_from_source: {
+        source_build: {
             prefer: false,
         },
     },
diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index 9a1aafe..1023aa2 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv
@@ -34,6 +34,170 @@
 Landroid/net/wifi/AnqpInformationElement;->mElementId:I,lo-prio,max-target-o
 Landroid/net/wifi/AnqpInformationElement;->mPayload:[B,lo-prio,max-target-o
 Landroid/net/wifi/AnqpInformationElement;->mVendorId:I,lo-prio,max-target-o
+Landroid/net/wifi/BaseWifiService;-><clinit>()V,blocked
+Landroid/net/wifi/BaseWifiService;-><init>()V,blocked
+Landroid/net/wifi/BaseWifiService;->TAG:Ljava/lang/String;,blocked
+Landroid/net/wifi/BaseWifiService;->acquireMulticastLock(Landroid/os/IBinder;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->acquireWifiLock(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/WorkSource;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->addCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[BLjava/util/List;)V,blocked
+Landroid/net/wifi/BaseWifiService;->addNetworkSuggestions(Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)I,blocked
+Landroid/net/wifi/BaseWifiService;->addOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V,blocked
+Landroid/net/wifi/BaseWifiService;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;Landroid/os/Bundle;)I,blocked
+Landroid/net/wifi/BaseWifiService;->addOrUpdateNetworkPrivileged(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Landroid/net/wifi/WifiManager$AddNetworkResult;,blocked
+Landroid/net/wifi/BaseWifiService;->addOrUpdatePasspointConfiguration(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->addSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->addWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;)V,blocked
+Landroid/net/wifi/BaseWifiService;->allowAutojoin(IZ)V,blocked
+Landroid/net/wifi/BaseWifiService;->allowAutojoinGlobal(Z)V,blocked
+Landroid/net/wifi/BaseWifiService;->allowAutojoinPasspoint(Ljava/lang/String;Z)V,blocked
+Landroid/net/wifi/BaseWifiService;->calculateSignalLevel(I)I,blocked
+Landroid/net/wifi/BaseWifiService;->clearExternalPnoScanRequest()V,blocked
+Landroid/net/wifi/BaseWifiService;->clearOverrideCountryCode()V,blocked
+Landroid/net/wifi/BaseWifiService;->clearWifiConnectedNetworkScorer()V,blocked
+Landroid/net/wifi/BaseWifiService;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;)V,blocked
+Landroid/net/wifi/BaseWifiService;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->disableEphemeralNetwork(Ljava/lang/String;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->disableNetwork(ILjava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->disconnect(Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->enableNetwork(IZLjava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->enableTdls(Ljava/lang/String;Z)V,blocked
+Landroid/net/wifi/BaseWifiService;->enableTdlsWithMacAddress(Ljava/lang/String;Z)V,blocked
+Landroid/net/wifi/BaseWifiService;->enableVerboseLogging(I)V,blocked
+Landroid/net/wifi/BaseWifiService;->factoryReset(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->flushPasspointAnqpCache(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->forget(ILandroid/net/wifi/IActionListener;)V,blocked
+Landroid/net/wifi/BaseWifiService;->getAllMatchingFqdnsForScanResults(Ljava/util/List;)Ljava/util/Map;,blocked
+Landroid/net/wifi/BaseWifiService;->getAllMatchingPasspointProfilesForScanResults(Ljava/util/List;)Ljava/util/Map;,blocked
+Landroid/net/wifi/BaseWifiService;->getConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Z)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;,blocked
+Landroid/net/wifi/BaseWifiService;->getConnectionInfo(Ljava/lang/String;Ljava/lang/String;)Landroid/net/wifi/WifiInfo;,blocked
+Landroid/net/wifi/BaseWifiService;->getCountryCode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,blocked
+Landroid/net/wifi/BaseWifiService;->getCurrentNetwork()Landroid/net/Network;,blocked
+Landroid/net/wifi/BaseWifiService;->getCurrentNetworkWpsNfcConfigurationToken()Ljava/lang/String;,blocked
+Landroid/net/wifi/BaseWifiService;->getDhcpInfo(Ljava/lang/String;)Landroid/net/DhcpInfo;,blocked
+Landroid/net/wifi/BaseWifiService;->getFactoryMacAddresses()[Ljava/lang/String;,blocked
+Landroid/net/wifi/BaseWifiService;->getLastCallerInfoForApi(ILandroid/net/wifi/ILastCallerListener;)V,blocked
+Landroid/net/wifi/BaseWifiService;->getMatchingOsuProviders(Ljava/util/List;)Ljava/util/Map;,blocked
+Landroid/net/wifi/BaseWifiService;->getMatchingPasspointConfigsForOsuProviders(Ljava/util/List;)Ljava/util/Map;,blocked
+Landroid/net/wifi/BaseWifiService;->getMatchingScanResults(Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map;,blocked
+Landroid/net/wifi/BaseWifiService;->getNetworkSuggestions(Ljava/lang/String;)Ljava/util/List;,blocked
+Landroid/net/wifi/BaseWifiService;->getOemPrivilegedWifiAdminPackages()[Ljava/lang/String;,blocked
+Landroid/net/wifi/BaseWifiService;->getPasspointConfigurations(Ljava/lang/String;)Ljava/util/List;,blocked
+Landroid/net/wifi/BaseWifiService;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;,blocked
+Landroid/net/wifi/BaseWifiService;->getPrivilegedConnectedNetwork(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/net/wifi/WifiConfiguration;,blocked
+Landroid/net/wifi/BaseWifiService;->getScanResults(Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;,blocked
+Landroid/net/wifi/BaseWifiService;->getSoftApConfiguration()Landroid/net/wifi/SoftApConfiguration;,blocked
+Landroid/net/wifi/BaseWifiService;->getSsidsAllowlist(Ljava/lang/String;)Ljava/util/List;,blocked
+Landroid/net/wifi/BaseWifiService;->getStaConcurrencyForMultiInternetMode()I,blocked
+Landroid/net/wifi/BaseWifiService;->getSupportedFeatures()J,blocked
+Landroid/net/wifi/BaseWifiService;->getUsableChannels(III)Ljava/util/List;,blocked
+Landroid/net/wifi/BaseWifiService;->getVerboseLoggingLevel()I,blocked
+Landroid/net/wifi/BaseWifiService;->getWifiActivityEnergyInfoAsync(Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;)V,blocked
+Landroid/net/wifi/BaseWifiService;->getWifiApConfiguration()Landroid/net/wifi/WifiConfiguration;,blocked
+Landroid/net/wifi/BaseWifiService;->getWifiApEnabledState()I,blocked
+Landroid/net/wifi/BaseWifiService;->getWifiConfigForMatchedNetworkSuggestionsSharedWithUser(Ljava/util/List;)Ljava/util/List;,blocked
+Landroid/net/wifi/BaseWifiService;->getWifiConfigsForPasspointProfiles(Ljava/util/List;)Ljava/util/List;,blocked
+Landroid/net/wifi/BaseWifiService;->getWifiEnabledState()I,blocked
+Landroid/net/wifi/BaseWifiService;->initializeMulticastFiltering()V,blocked
+Landroid/net/wifi/BaseWifiService;->is24GHzBandSupported()Z,blocked
+Landroid/net/wifi/BaseWifiService;->is5GHzBandSupported()Z,blocked
+Landroid/net/wifi/BaseWifiService;->is60GHzBandSupported()Z,blocked
+Landroid/net/wifi/BaseWifiService;->is6GHzBandSupported()Z,blocked
+Landroid/net/wifi/BaseWifiService;->isAutoWakeupEnabled()Z,blocked
+Landroid/net/wifi/BaseWifiService;->isCarrierNetworkOffloadEnabled(IZ)Z,blocked
+Landroid/net/wifi/BaseWifiService;->isDefaultCoexAlgorithmEnabled()Z,blocked
+Landroid/net/wifi/BaseWifiService;->isMulticastEnabled()Z,blocked
+Landroid/net/wifi/BaseWifiService;->isScanAlwaysAvailable()Z,blocked
+Landroid/net/wifi/BaseWifiService;->isScanThrottleEnabled()Z,blocked
+Landroid/net/wifi/BaseWifiService;->isWifiPasspointEnabled()Z,blocked
+Landroid/net/wifi/BaseWifiService;->isWifiStandardSupported(I)Z,blocked
+Landroid/net/wifi/BaseWifiService;->matchProviderWithCurrentNetwork(Ljava/lang/String;)I,blocked
+Landroid/net/wifi/BaseWifiService;->notifyMinimumRequiredWifiSecurityLevelChanged(I)V,blocked
+Landroid/net/wifi/BaseWifiService;->notifyUserOfApBandConversion(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->notifyWifiSsidPolicyChanged(ILjava/util/List;)V,blocked
+Landroid/net/wifi/BaseWifiService;->queryAutojoinGlobal(Landroid/net/wifi/IBooleanListener;)V,blocked
+Landroid/net/wifi/BaseWifiService;->queryPasspointIcon(JLjava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->reassociate(Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->reconnect(Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->registerCoexCallback(Landroid/net/wifi/ICoexCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->registerDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;Ljava/lang/String;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->registerLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V,blocked
+Landroid/net/wifi/BaseWifiService;->registerNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->registerScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->registerSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->registerSubsystemRestartCallback(Landroid/net/wifi/ISubsystemRestartCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->registerSuggestionConnectionStatusListener(Landroid/net/wifi/ISuggestionConnectionStatusListener;Ljava/lang/String;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->registerTrafficStateCallback(Landroid/net/wifi/ITrafficStateCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->releaseMulticastLock(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->releaseWifiLock(Landroid/os/IBinder;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->removeAppState(ILjava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->removeCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[B)V,blocked
+Landroid/net/wifi/BaseWifiService;->removeNetwork(ILjava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;I)I,blocked
+Landroid/net/wifi/BaseWifiService;->removeNonCallerConfiguredNetworks(Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->removeOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V,blocked
+Landroid/net/wifi/BaseWifiService;->removePasspointConfiguration(Ljava/lang/String;Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->removeSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;)V,blocked
+Landroid/net/wifi/BaseWifiService;->replyToP2pInvitationReceivedDialog(IZLjava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->replyToSimpleDialog(II)V,blocked
+Landroid/net/wifi/BaseWifiService;->reportCreateInterfaceImpact(Ljava/lang/String;IZLandroid/net/wifi/IInterfaceCreationInfoCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->restartWifiSubsystem()V,blocked
+Landroid/net/wifi/BaseWifiService;->restoreBackupData([B)V,blocked
+Landroid/net/wifi/BaseWifiService;->restoreSoftApBackupData([B)Landroid/net/wifi/SoftApConfiguration;,blocked
+Landroid/net/wifi/BaseWifiService;->restoreSupplicantBackupData([B[B)V,blocked
+Landroid/net/wifi/BaseWifiService;->retrieveBackupData()[B,blocked
+Landroid/net/wifi/BaseWifiService;->retrieveSoftApBackupData()[B,blocked
+Landroid/net/wifi/BaseWifiService;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;)V,blocked
+Landroid/net/wifi/BaseWifiService;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->setAutoWakeupEnabled(Z)V,blocked
+Landroid/net/wifi/BaseWifiService;->setCarrierNetworkOffloadEnabled(IZZ)V,blocked
+Landroid/net/wifi/BaseWifiService;->setCoexUnsafeChannels(Ljava/util/List;I)V,blocked
+Landroid/net/wifi/BaseWifiService;->setDefaultCountryCode(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->setDeviceMobilityState(I)V,blocked
+Landroid/net/wifi/BaseWifiService;->setEmergencyScanRequestInProgress(Z)V,blocked
+Landroid/net/wifi/BaseWifiService;->setExternalPnoScanRequest(Landroid/os/IBinder;Landroid/net/wifi/IPnoScanResultsCallback;Ljava/util/List;[ILjava/lang/String;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->setMacRandomizationSettingPasspointEnabled(Ljava/lang/String;Z)V,blocked
+Landroid/net/wifi/BaseWifiService;->setOneShotScreenOnConnectivityScanDelayMillis(I)V,blocked
+Landroid/net/wifi/BaseWifiService;->setOverrideCountryCode(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->setPasspointMeteredOverride(Ljava/lang/String;I)V,blocked
+Landroid/net/wifi/BaseWifiService;->setScanAlwaysAvailable(ZLjava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->setScanThrottleEnabled(Z)V,blocked
+Landroid/net/wifi/BaseWifiService;->setScreenOnScanSchedule([I[I)V,blocked
+Landroid/net/wifi/BaseWifiService;->setSoftApConfiguration(Landroid/net/wifi/SoftApConfiguration;Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->setSsidsAllowlist(Ljava/lang/String;Ljava/util/List;)V,blocked
+Landroid/net/wifi/BaseWifiService;->setStaConcurrencyForMultiInternetMode(I)Z,blocked
+Landroid/net/wifi/BaseWifiService;->setWifiApConfiguration(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->setWifiConnectedNetworkScorer(Landroid/os/IBinder;Landroid/net/wifi/IWifiConnectedNetworkScorer;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->setWifiEnabled(Ljava/lang/String;Z)Z,blocked
+Landroid/net/wifi/BaseWifiService;->setWifiPasspointEnabled(Z)V,blocked
+Landroid/net/wifi/BaseWifiService;->setWifiScoringEnabled(Z)Z,blocked
+Landroid/net/wifi/BaseWifiService;->startDppAsConfiguratorInitiator(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;IILandroid/net/wifi/IDppCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->startDppAsEnrolleeInitiator(Landroid/os/IBinder;Ljava/lang/String;Landroid/net/wifi/IDppCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->startDppAsEnrolleeResponder(Landroid/os/IBinder;Ljava/lang/String;ILandroid/net/wifi/IDppCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;Landroid/os/Bundle;)I,blocked
+Landroid/net/wifi/BaseWifiService;->startRestrictingAutoJoinToSubscriptionId(I)V,blocked
+Landroid/net/wifi/BaseWifiService;->startScan(Ljava/lang/String;Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->startSoftAp(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->startSubscriptionProvisioning(Landroid/net/wifi/hotspot2/OsuProvider;Landroid/net/wifi/hotspot2/IProvisioningCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->startTetheredHotspot(Landroid/net/wifi/SoftApConfiguration;Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/BaseWifiService;->startWatchLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->stopDppSession()V,blocked
+Landroid/net/wifi/BaseWifiService;->stopLocalOnlyHotspot()V,blocked
+Landroid/net/wifi/BaseWifiService;->stopRestrictingAutoJoinToSubscriptionId()V,blocked
+Landroid/net/wifi/BaseWifiService;->stopSoftAp()Z,blocked
+Landroid/net/wifi/BaseWifiService;->stopWatchLocalOnlyHotspot()V,blocked
+Landroid/net/wifi/BaseWifiService;->unregisterCoexCallback(Landroid/net/wifi/ICoexCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->unregisterDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;)V,blocked
+Landroid/net/wifi/BaseWifiService;->unregisterLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V,blocked
+Landroid/net/wifi/BaseWifiService;->unregisterNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->unregisterScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->unregisterSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->unregisterSubsystemRestartCallback(Landroid/net/wifi/ISubsystemRestartCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->unregisterSuggestionConnectionStatusListener(Landroid/net/wifi/ISuggestionConnectionStatusListener;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/BaseWifiService;->unregisterTrafficStateCallback(Landroid/net/wifi/ITrafficStateCallback;)V,blocked
+Landroid/net/wifi/BaseWifiService;->updateInterfaceIpState(Ljava/lang/String;I)V,blocked
+Landroid/net/wifi/BaseWifiService;->updateWifiLockWorkSource(Landroid/os/IBinder;Landroid/os/WorkSource;)V,blocked
+Landroid/net/wifi/BaseWifiService;->updateWifiUsabilityScore(III)V,blocked
 Landroid/net/wifi/BatchedScanResult$1;-><init>()V,blocked
 Landroid/net/wifi/BatchedScanResult$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/BatchedScanResult;,blocked
 Landroid/net/wifi/BatchedScanResult$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -138,18 +302,30 @@
 Landroid/net/wifi/IActionListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
 Landroid/net/wifi/IActionListener$Stub$Proxy;->onFailure(I)V,blocked
 Landroid/net/wifi/IActionListener$Stub$Proxy;->onSuccess()V,blocked
-Landroid/net/wifi/IActionListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IActionListener;,blocked
 Landroid/net/wifi/IActionListener$Stub;-><init>()V,blocked
 Landroid/net/wifi/IActionListener$Stub;->TRANSACTION_onFailure:I,blocked
 Landroid/net/wifi/IActionListener$Stub;->TRANSACTION_onSuccess:I,blocked
 Landroid/net/wifi/IActionListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IActionListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IActionListener;,blocked
-Landroid/net/wifi/IActionListener$Stub;->getDefaultImpl()Landroid/net/wifi/IActionListener;,blocked
 Landroid/net/wifi/IActionListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/IActionListener$Stub;->setDefaultImpl(Landroid/net/wifi/IActionListener;)Z,blocked
 Landroid/net/wifi/IActionListener;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/IActionListener;->onFailure(I)V,blocked
 Landroid/net/wifi/IActionListener;->onSuccess()V,blocked
+Landroid/net/wifi/IBooleanListener$Default;-><init>()V,blocked
+Landroid/net/wifi/IBooleanListener$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IBooleanListener$Default;->onResult(Z)V,blocked
+Landroid/net/wifi/IBooleanListener$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,blocked
+Landroid/net/wifi/IBooleanListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IBooleanListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
+Landroid/net/wifi/IBooleanListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
+Landroid/net/wifi/IBooleanListener$Stub$Proxy;->onResult(Z)V,blocked
+Landroid/net/wifi/IBooleanListener$Stub;-><init>()V,blocked
+Landroid/net/wifi/IBooleanListener$Stub;->TRANSACTION_onResult:I,blocked
+Landroid/net/wifi/IBooleanListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IBooleanListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IBooleanListener;,blocked
+Landroid/net/wifi/IBooleanListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IBooleanListener;->DESCRIPTOR:Ljava/lang/String;,blocked
+Landroid/net/wifi/IBooleanListener;->onResult(Z)V,blocked
 Landroid/net/wifi/ICoexCallback$Default;-><init>()V,blocked
 Landroid/net/wifi/ICoexCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ICoexCallback$Default;->onCoexUnsafeChannelsChanged(Ljava/util/List;I)V,blocked
@@ -158,14 +334,11 @@
 Landroid/net/wifi/ICoexCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
 Landroid/net/wifi/ICoexCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
 Landroid/net/wifi/ICoexCallback$Stub$Proxy;->onCoexUnsafeChannelsChanged(Ljava/util/List;I)V,blocked
-Landroid/net/wifi/ICoexCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ICoexCallback;,blocked
 Landroid/net/wifi/ICoexCallback$Stub;-><init>()V,blocked
 Landroid/net/wifi/ICoexCallback$Stub;->TRANSACTION_onCoexUnsafeChannelsChanged:I,blocked
 Landroid/net/wifi/ICoexCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ICoexCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ICoexCallback;,blocked
-Landroid/net/wifi/ICoexCallback$Stub;->getDefaultImpl()Landroid/net/wifi/ICoexCallback;,blocked
 Landroid/net/wifi/ICoexCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/ICoexCallback$Stub;->setDefaultImpl(Landroid/net/wifi/ICoexCallback;)Z,blocked
 Landroid/net/wifi/ICoexCallback;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/ICoexCallback;->onCoexUnsafeChannelsChanged(Ljava/util/List;I)V,blocked
 Landroid/net/wifi/IDppCallback$Default;-><init>()V,blocked
@@ -184,7 +357,6 @@
 Landroid/net/wifi/IDppCallback$Stub$Proxy;->onProgress(I)V,blocked
 Landroid/net/wifi/IDppCallback$Stub$Proxy;->onSuccess(I)V,blocked
 Landroid/net/wifi/IDppCallback$Stub$Proxy;->onSuccessConfigReceived(I)V,blocked
-Landroid/net/wifi/IDppCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IDppCallback;,blocked
 Landroid/net/wifi/IDppCallback$Stub;-><init>()V,blocked
 Landroid/net/wifi/IDppCallback$Stub;->TRANSACTION_onBootstrapUriGenerated:I,blocked
 Landroid/net/wifi/IDppCallback$Stub;->TRANSACTION_onFailure:I,blocked
@@ -193,15 +365,43 @@
 Landroid/net/wifi/IDppCallback$Stub;->TRANSACTION_onSuccessConfigReceived:I,blocked
 Landroid/net/wifi/IDppCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IDppCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IDppCallback;,blocked
-Landroid/net/wifi/IDppCallback$Stub;->getDefaultImpl()Landroid/net/wifi/IDppCallback;,blocked
 Landroid/net/wifi/IDppCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/IDppCallback$Stub;->setDefaultImpl(Landroid/net/wifi/IDppCallback;)Z,blocked
 Landroid/net/wifi/IDppCallback;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/IDppCallback;->onBootstrapUriGenerated(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IDppCallback;->onFailure(ILjava/lang/String;Ljava/lang/String;[I)V,blocked
 Landroid/net/wifi/IDppCallback;->onProgress(I)V,blocked
 Landroid/net/wifi/IDppCallback;->onSuccess(I)V,blocked
 Landroid/net/wifi/IDppCallback;->onSuccessConfigReceived(I)V,blocked
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Default;-><init>()V,blocked
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Default;->onResults(Z[I[Ljava/lang/String;)V,blocked
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,blocked
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub$Proxy;->onResults(Z[I[Ljava/lang/String;)V,blocked
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub;-><init>()V,blocked
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub;->TRANSACTION_onResults:I,blocked
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IInterfaceCreationInfoCallback;,blocked
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IInterfaceCreationInfoCallback;->DESCRIPTOR:Ljava/lang/String;,blocked
+Landroid/net/wifi/IInterfaceCreationInfoCallback;->onResults(Z[I[Ljava/lang/String;)V,blocked
+Landroid/net/wifi/ILastCallerListener$Default;-><init>()V,blocked
+Landroid/net/wifi/ILastCallerListener$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ILastCallerListener$Default;->onResult(Ljava/lang/String;Z)V,blocked
+Landroid/net/wifi/ILastCallerListener$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,blocked
+Landroid/net/wifi/ILastCallerListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ILastCallerListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
+Landroid/net/wifi/ILastCallerListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
+Landroid/net/wifi/ILastCallerListener$Stub$Proxy;->onResult(Ljava/lang/String;Z)V,blocked
+Landroid/net/wifi/ILastCallerListener$Stub;-><init>()V,blocked
+Landroid/net/wifi/ILastCallerListener$Stub;->TRANSACTION_onResult:I,blocked
+Landroid/net/wifi/ILastCallerListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ILastCallerListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ILastCallerListener;,blocked
+Landroid/net/wifi/ILastCallerListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ILastCallerListener;->DESCRIPTOR:Ljava/lang/String;,blocked
+Landroid/net/wifi/ILastCallerListener;->onResult(Ljava/lang/String;Z)V,blocked
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Default;-><init>()V,blocked
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Default;->onHotspotFailed(I)V,blocked
@@ -214,16 +414,13 @@
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub$Proxy;->onHotspotFailed(I)V,blocked
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub$Proxy;->onHotspotStarted(Landroid/net/wifi/SoftApConfiguration;)V,blocked
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub$Proxy;->onHotspotStopped()V,blocked
-Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ILocalOnlyHotspotCallback;,blocked
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;-><init>()V,blocked
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->TRANSACTION_onHotspotFailed:I,blocked
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->TRANSACTION_onHotspotStarted:I,blocked
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->TRANSACTION_onHotspotStopped:I,blocked
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ILocalOnlyHotspotCallback;,blocked
-Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->getDefaultImpl()Landroid/net/wifi/ILocalOnlyHotspotCallback;,blocked
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->setDefaultImpl(Landroid/net/wifi/ILocalOnlyHotspotCallback;)Z,blocked
 Landroid/net/wifi/ILocalOnlyHotspotCallback;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/ILocalOnlyHotspotCallback;->onHotspotFailed(I)V,blocked
 Landroid/net/wifi/ILocalOnlyHotspotCallback;->onHotspotStarted(Landroid/net/wifi/SoftApConfiguration;)V,blocked
@@ -244,7 +441,6 @@
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub$Proxy;->onUserSelectionCallbackRegistration(Landroid/net/wifi/INetworkRequestUserSelectionCallback;)V,blocked
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub$Proxy;->onUserSelectionConnectFailure(Landroid/net/wifi/WifiConfiguration;)V,blocked
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub$Proxy;->onUserSelectionConnectSuccess(Landroid/net/wifi/WifiConfiguration;)V,blocked
-Landroid/net/wifi/INetworkRequestMatchCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/INetworkRequestMatchCallback;,blocked
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;-><init>()V,blocked
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->TRANSACTION_onAbort:I,blocked
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->TRANSACTION_onMatch:I,blocked
@@ -253,9 +449,7 @@
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->TRANSACTION_onUserSelectionConnectSuccess:I,blocked
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/INetworkRequestMatchCallback;,blocked
-Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->getDefaultImpl()Landroid/net/wifi/INetworkRequestMatchCallback;,blocked
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->setDefaultImpl(Landroid/net/wifi/INetworkRequestMatchCallback;)Z,blocked
 Landroid/net/wifi/INetworkRequestMatchCallback;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/INetworkRequestMatchCallback;->onAbort()V,blocked
 Landroid/net/wifi/INetworkRequestMatchCallback;->onMatch(Ljava/util/List;)V,blocked
@@ -271,16 +465,13 @@
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub$Proxy;->reject()V,blocked
-Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/INetworkRequestUserSelectionCallback;,blocked
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub$Proxy;->select(Landroid/net/wifi/WifiConfiguration;)V,blocked
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;-><init>()V,blocked
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->TRANSACTION_reject:I,blocked
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->TRANSACTION_select:I,blocked
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/INetworkRequestUserSelectionCallback;,blocked
-Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->getDefaultImpl()Landroid/net/wifi/INetworkRequestUserSelectionCallback;,blocked
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->setDefaultImpl(Landroid/net/wifi/INetworkRequestUserSelectionCallback;)Z,blocked
 Landroid/net/wifi/INetworkRequestUserSelectionCallback;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/INetworkRequestUserSelectionCallback;->reject()V,blocked
 Landroid/net/wifi/INetworkRequestUserSelectionCallback;->select(Landroid/net/wifi/WifiConfiguration;)V,blocked
@@ -292,16 +483,28 @@
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub$Proxy;->onWifiActivityEnergyInfo(Landroid/os/connectivity/WifiActivityEnergyInfo;)V,blocked
-Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;,blocked
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;-><init>()V,blocked
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;->TRANSACTION_onWifiActivityEnergyInfo:I,blocked
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;,blocked
-Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;->getDefaultImpl()Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;,blocked
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;->setDefaultImpl(Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;)Z,blocked
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;->onWifiActivityEnergyInfo(Landroid/os/connectivity/WifiActivityEnergyInfo;)V,blocked
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Default;-><init>()V,blocked
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Default;->onDriverCountryCodeChanged(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,blocked
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub$Proxy;->onDriverCountryCodeChanged(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub;-><init>()V,blocked
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub;->TRANSACTION_onDriverCountryCodeChanged:I,blocked
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;,blocked
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;->DESCRIPTOR:Ljava/lang/String;,blocked
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;->onDriverCountryCodeChanged(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Default;-><init>()V,blocked
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Default;->onWifiUsabilityStats(IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V,blocked
@@ -310,16 +513,40 @@
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub$Proxy;->onWifiUsabilityStats(IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V,blocked
-Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IOnWifiUsabilityStatsListener;,blocked
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;-><init>()V,blocked
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;->TRANSACTION_onWifiUsabilityStats:I,blocked
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IOnWifiUsabilityStatsListener;,blocked
-Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;->getDefaultImpl()Landroid/net/wifi/IOnWifiUsabilityStatsListener;,blocked
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;->setDefaultImpl(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)Z,blocked
 Landroid/net/wifi/IOnWifiUsabilityStatsListener;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/IOnWifiUsabilityStatsListener;->onWifiUsabilityStats(IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Default;-><init>()V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IPnoScanResultsCallback$Default;->onRegisterFailed(I)V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Default;->onRegisterSuccess()V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Default;->onRemoved(I)V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Default;->onScanResultsAvailable(Ljava/util/List;)V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->onRegisterFailed(I)V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->onRegisterSuccess()V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->onRemoved(I)V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->onScanResultsAvailable(Ljava/util/List;)V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;-><init>()V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->TRANSACTION_onRegisterFailed:I,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->TRANSACTION_onRegisterSuccess:I,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->TRANSACTION_onRemoved:I,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->TRANSACTION_onScanResultsAvailable:I,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IPnoScanResultsCallback;,blocked
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IPnoScanResultsCallback;->DESCRIPTOR:Ljava/lang/String;,blocked
+Landroid/net/wifi/IPnoScanResultsCallback;->onRegisterFailed(I)V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback;->onRegisterSuccess()V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback;->onRemoved(I)V,blocked
+Landroid/net/wifi/IPnoScanResultsCallback;->onScanResultsAvailable(Ljava/util/List;)V,blocked
 Landroid/net/wifi/IScanResultsCallback$Default;-><init>()V,blocked
 Landroid/net/wifi/IScanResultsCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IScanResultsCallback$Default;->onScanResultsAvailable()V,blocked
@@ -328,14 +555,11 @@
 Landroid/net/wifi/IScanResultsCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
 Landroid/net/wifi/IScanResultsCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
 Landroid/net/wifi/IScanResultsCallback$Stub$Proxy;->onScanResultsAvailable()V,blocked
-Landroid/net/wifi/IScanResultsCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IScanResultsCallback;,blocked
 Landroid/net/wifi/IScanResultsCallback$Stub;-><init>()V,blocked
 Landroid/net/wifi/IScanResultsCallback$Stub;->TRANSACTION_onScanResultsAvailable:I,blocked
 Landroid/net/wifi/IScanResultsCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IScanResultsCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IScanResultsCallback;,blocked
-Landroid/net/wifi/IScanResultsCallback$Stub;->getDefaultImpl()Landroid/net/wifi/IScanResultsCallback;,blocked
 Landroid/net/wifi/IScanResultsCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/IScanResultsCallback$Stub;->setDefaultImpl(Landroid/net/wifi/IScanResultsCallback;)Z,blocked
 Landroid/net/wifi/IScanResultsCallback;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/IScanResultsCallback;->onScanResultsAvailable()V,blocked
 Landroid/net/wifi/IScanResultsListener$Default;-><init>()V,blocked
@@ -346,14 +570,11 @@
 Landroid/net/wifi/IScanResultsListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
 Landroid/net/wifi/IScanResultsListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
 Landroid/net/wifi/IScanResultsListener$Stub$Proxy;->onScanResultsAvailable()V,blocked
-Landroid/net/wifi/IScanResultsListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IScanResultsListener;,blocked
 Landroid/net/wifi/IScanResultsListener$Stub;-><init>()V,blocked
 Landroid/net/wifi/IScanResultsListener$Stub;->TRANSACTION_onScanResultsAvailable:I,blocked
 Landroid/net/wifi/IScanResultsListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IScanResultsListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IScanResultsListener;,blocked
-Landroid/net/wifi/IScanResultsListener$Stub;->getDefaultImpl()Landroid/net/wifi/IScanResultsListener;,blocked
 Landroid/net/wifi/IScanResultsListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/IScanResultsListener$Stub;->setDefaultImpl(Landroid/net/wifi/IScanResultsListener;)Z,blocked
 Landroid/net/wifi/IScanResultsListener;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/IScanResultsListener;->onScanResultsAvailable()V,blocked
 Landroid/net/wifi/IScoreUpdateObserver$Default;-><init>()V,blocked
@@ -371,7 +592,6 @@
 Landroid/net/wifi/IScoreUpdateObserver$Stub$Proxy;->notifyScoreUpdate(II)V,blocked
 Landroid/net/wifi/IScoreUpdateObserver$Stub$Proxy;->notifyStatusUpdate(IZ)V,blocked
 Landroid/net/wifi/IScoreUpdateObserver$Stub$Proxy;->requestNudOperation(I)V,blocked
-Landroid/net/wifi/IScoreUpdateObserver$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IScoreUpdateObserver;,blocked
 Landroid/net/wifi/IScoreUpdateObserver$Stub$Proxy;->triggerUpdateOfWifiUsabilityStats(I)V,blocked
 Landroid/net/wifi/IScoreUpdateObserver$Stub;-><init>()V,blocked
 Landroid/net/wifi/IScoreUpdateObserver$Stub;->TRANSACTION_blocklistCurrentBssid:I,blocked
@@ -381,9 +601,7 @@
 Landroid/net/wifi/IScoreUpdateObserver$Stub;->TRANSACTION_triggerUpdateOfWifiUsabilityStats:I,blocked
 Landroid/net/wifi/IScoreUpdateObserver$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IScoreUpdateObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IScoreUpdateObserver;,blocked
-Landroid/net/wifi/IScoreUpdateObserver$Stub;->getDefaultImpl()Landroid/net/wifi/IScoreUpdateObserver;,blocked
 Landroid/net/wifi/IScoreUpdateObserver$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/IScoreUpdateObserver$Stub;->setDefaultImpl(Landroid/net/wifi/IScoreUpdateObserver;)Z,blocked
 Landroid/net/wifi/IScoreUpdateObserver;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/IScoreUpdateObserver;->blocklistCurrentBssid(I)V,blocked
 Landroid/net/wifi/IScoreUpdateObserver;->notifyScoreUpdate(II)V,blocked
@@ -420,7 +638,6 @@
 Landroid/net/wifi/ISoftApCallback$Stub$Proxy;->onCapabilityChanged(Landroid/net/wifi/SoftApCapability;)V,blocked
 Landroid/net/wifi/ISoftApCallback$Stub$Proxy;->onConnectedClientsOrInfoChanged(Ljava/util/Map;Ljava/util/Map;ZZ)V,blocked
 Landroid/net/wifi/ISoftApCallback$Stub$Proxy;->onStateChanged(II)V,lo-prio,max-target-o
-Landroid/net/wifi/ISoftApCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ISoftApCallback;,blocked
 Landroid/net/wifi/ISoftApCallback$Stub;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/ISoftApCallback$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/ISoftApCallback$Stub;->TRANSACTION_onBlockedClientConnecting:I,blocked
@@ -429,11 +646,9 @@
 Landroid/net/wifi/ISoftApCallback$Stub;->TRANSACTION_onStateChanged:I,lo-prio,max-target-o
 Landroid/net/wifi/ISoftApCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ISoftApCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ISoftApCallback;,lo-prio,max-target-o
-Landroid/net/wifi/ISoftApCallback$Stub;->getDefaultImpl()Landroid/net/wifi/ISoftApCallback;,blocked
 Landroid/net/wifi/ISoftApCallback$Stub;->lambda$onTransact$0(Landroid/os/Parcel;Ljava/util/Map;I)V,blocked
 Landroid/net/wifi/ISoftApCallback$Stub;->lambda$onTransact$1(Landroid/os/Parcel;Ljava/util/Map;I)V,blocked
 Landroid/net/wifi/ISoftApCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/ISoftApCallback$Stub;->setDefaultImpl(Landroid/net/wifi/ISoftApCallback;)Z,blocked
 Landroid/net/wifi/ISoftApCallback;->onBlockedClientConnecting(Landroid/net/wifi/WifiClient;I)V,blocked
 Landroid/net/wifi/ISoftApCallback;->onCapabilityChanged(Landroid/net/wifi/SoftApCapability;)V,blocked
 Landroid/net/wifi/ISoftApCallback;->onConnectedClientsOrInfoChanged(Ljava/util/Map;Ljava/util/Map;ZZ)V,blocked
@@ -448,15 +663,12 @@
 Landroid/net/wifi/ISubsystemRestartCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
 Landroid/net/wifi/ISubsystemRestartCallback$Stub$Proxy;->onSubsystemRestarted()V,blocked
 Landroid/net/wifi/ISubsystemRestartCallback$Stub$Proxy;->onSubsystemRestarting()V,blocked
-Landroid/net/wifi/ISubsystemRestartCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ISubsystemRestartCallback;,blocked
 Landroid/net/wifi/ISubsystemRestartCallback$Stub;-><init>()V,blocked
 Landroid/net/wifi/ISubsystemRestartCallback$Stub;->TRANSACTION_onSubsystemRestarted:I,blocked
 Landroid/net/wifi/ISubsystemRestartCallback$Stub;->TRANSACTION_onSubsystemRestarting:I,blocked
 Landroid/net/wifi/ISubsystemRestartCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ISubsystemRestartCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ISubsystemRestartCallback;,blocked
-Landroid/net/wifi/ISubsystemRestartCallback$Stub;->getDefaultImpl()Landroid/net/wifi/ISubsystemRestartCallback;,blocked
 Landroid/net/wifi/ISubsystemRestartCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/ISubsystemRestartCallback$Stub;->setDefaultImpl(Landroid/net/wifi/ISubsystemRestartCallback;)Z,blocked
 Landroid/net/wifi/ISubsystemRestartCallback;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/ISubsystemRestartCallback;->onSubsystemRestarted()V,blocked
 Landroid/net/wifi/ISubsystemRestartCallback;->onSubsystemRestarting()V,blocked
@@ -468,14 +680,11 @@
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub$Proxy;->onConnectionStatus(Landroid/net/wifi/WifiNetworkSuggestion;I)V,blocked
-Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ISuggestionConnectionStatusListener;,blocked
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;-><init>()V,blocked
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;->TRANSACTION_onConnectionStatus:I,blocked
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ISuggestionConnectionStatusListener;,blocked
-Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;->getDefaultImpl()Landroid/net/wifi/ISuggestionConnectionStatusListener;,blocked
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;->setDefaultImpl(Landroid/net/wifi/ISuggestionConnectionStatusListener;)Z,blocked
 Landroid/net/wifi/ISuggestionConnectionStatusListener;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/ISuggestionConnectionStatusListener;->onConnectionStatus(Landroid/net/wifi/WifiNetworkSuggestion;I)V,blocked
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Default;-><init>()V,blocked
@@ -486,14 +695,11 @@
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub$Proxy;->onUserApprovalStatusChange(I)V,blocked
-Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ISuggestionUserApprovalStatusListener;,blocked
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;-><init>()V,blocked
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;->TRANSACTION_onUserApprovalStatusChange:I,blocked
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ISuggestionUserApprovalStatusListener;,blocked
-Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;->getDefaultImpl()Landroid/net/wifi/ISuggestionUserApprovalStatusListener;,blocked
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;->setDefaultImpl(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;)Z,blocked
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener;->onUserApprovalStatusChange(I)V,blocked
 Landroid/net/wifi/ITrafficStateCallback$Default;-><init>()V,blocked
@@ -504,14 +710,11 @@
 Landroid/net/wifi/ITrafficStateCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
 Landroid/net/wifi/ITrafficStateCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
 Landroid/net/wifi/ITrafficStateCallback$Stub$Proxy;->onStateChanged(I)V,blocked
-Landroid/net/wifi/ITrafficStateCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ITrafficStateCallback;,blocked
 Landroid/net/wifi/ITrafficStateCallback$Stub;-><init>()V,blocked
 Landroid/net/wifi/ITrafficStateCallback$Stub;->TRANSACTION_onStateChanged:I,blocked
 Landroid/net/wifi/ITrafficStateCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ITrafficStateCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ITrafficStateCallback;,blocked
-Landroid/net/wifi/ITrafficStateCallback$Stub;->getDefaultImpl()Landroid/net/wifi/ITrafficStateCallback;,blocked
 Landroid/net/wifi/ITrafficStateCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/ITrafficStateCallback$Stub;->setDefaultImpl(Landroid/net/wifi/ITrafficStateCallback;)Z,blocked
 Landroid/net/wifi/ITrafficStateCallback;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/ITrafficStateCallback;->onStateChanged(I)V,blocked
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Default;-><init>()V,blocked
@@ -526,16 +729,13 @@
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub$Proxy;->onSetScoreUpdateObserver(Landroid/net/wifi/IScoreUpdateObserver;)V,blocked
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub$Proxy;->onStart(Landroid/net/wifi/WifiConnectedSessionInfo;)V,blocked
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub$Proxy;->onStop(I)V,blocked
-Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IWifiConnectedNetworkScorer;,blocked
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;-><init>()V,blocked
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->TRANSACTION_onSetScoreUpdateObserver:I,blocked
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->TRANSACTION_onStart:I,blocked
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->TRANSACTION_onStop:I,blocked
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiConnectedNetworkScorer;,blocked
-Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->getDefaultImpl()Landroid/net/wifi/IWifiConnectedNetworkScorer;,blocked
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->setDefaultImpl(Landroid/net/wifi/IWifiConnectedNetworkScorer;)Z,blocked
 Landroid/net/wifi/IWifiConnectedNetworkScorer;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/IWifiConnectedNetworkScorer;->onSetScoreUpdateObserver(Landroid/net/wifi/IScoreUpdateObserver;)V,blocked
 Landroid/net/wifi/IWifiConnectedNetworkScorer;->onStart(Landroid/net/wifi/WifiConnectedSessionInfo;)V,blocked
@@ -543,9 +743,10 @@
 Landroid/net/wifi/IWifiManager$Default;-><init>()V,blocked
 Landroid/net/wifi/IWifiManager$Default;->acquireMulticastLock(Landroid/os/IBinder;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->acquireWifiLock(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/WorkSource;)Z,blocked
+Landroid/net/wifi/IWifiManager$Default;->addCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[BLjava/util/List;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->addNetworkSuggestions(Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)I,blocked
 Landroid/net/wifi/IWifiManager$Default;->addOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V,blocked
-Landroid/net/wifi/IWifiManager$Default;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)I,blocked
+Landroid/net/wifi/IWifiManager$Default;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;Landroid/os/Bundle;)I,blocked
 Landroid/net/wifi/IWifiManager$Default;->addOrUpdateNetworkPrivileged(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Landroid/net/wifi/WifiManager$AddNetworkResult;,blocked
 Landroid/net/wifi/IWifiManager$Default;->addOrUpdatePasspointConfiguration(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->addSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V,blocked
@@ -555,9 +756,10 @@
 Landroid/net/wifi/IWifiManager$Default;->allowAutojoinPasspoint(Ljava/lang/String;Z)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IWifiManager$Default;->calculateSignalLevel(I)I,blocked
+Landroid/net/wifi/IWifiManager$Default;->clearExternalPnoScanRequest()V,blocked
 Landroid/net/wifi/IWifiManager$Default;->clearOverrideCountryCode()V,blocked
 Landroid/net/wifi/IWifiManager$Default;->clearWifiConnectedNetworkScorer()V,blocked
-Landroid/net/wifi/IWifiManager$Default;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->disableEphemeralNetwork(Ljava/lang/String;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->disableNetwork(ILjava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->disconnect(Ljava/lang/String;)Z,blocked
@@ -572,19 +774,24 @@
 Landroid/net/wifi/IWifiManager$Default;->getAllMatchingPasspointProfilesForScanResults(Ljava/util/List;)Ljava/util/Map;,blocked
 Landroid/net/wifi/IWifiManager$Default;->getConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Z)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;,blocked
 Landroid/net/wifi/IWifiManager$Default;->getConnectionInfo(Ljava/lang/String;Ljava/lang/String;)Landroid/net/wifi/WifiInfo;,blocked
-Landroid/net/wifi/IWifiManager$Default;->getCountryCode()Ljava/lang/String;,blocked
+Landroid/net/wifi/IWifiManager$Default;->getCountryCode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,blocked
 Landroid/net/wifi/IWifiManager$Default;->getCurrentNetwork()Landroid/net/Network;,blocked
 Landroid/net/wifi/IWifiManager$Default;->getCurrentNetworkWpsNfcConfigurationToken()Ljava/lang/String;,blocked
 Landroid/net/wifi/IWifiManager$Default;->getDhcpInfo(Ljava/lang/String;)Landroid/net/DhcpInfo;,blocked
 Landroid/net/wifi/IWifiManager$Default;->getFactoryMacAddresses()[Ljava/lang/String;,blocked
+Landroid/net/wifi/IWifiManager$Default;->getLastCallerInfoForApi(ILandroid/net/wifi/ILastCallerListener;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->getMatchingOsuProviders(Ljava/util/List;)Ljava/util/Map;,blocked
 Landroid/net/wifi/IWifiManager$Default;->getMatchingPasspointConfigsForOsuProviders(Ljava/util/List;)Ljava/util/Map;,blocked
 Landroid/net/wifi/IWifiManager$Default;->getMatchingScanResults(Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map;,blocked
 Landroid/net/wifi/IWifiManager$Default;->getNetworkSuggestions(Ljava/lang/String;)Ljava/util/List;,blocked
+Landroid/net/wifi/IWifiManager$Default;->getOemPrivilegedWifiAdminPackages()[Ljava/lang/String;,blocked
 Landroid/net/wifi/IWifiManager$Default;->getPasspointConfigurations(Ljava/lang/String;)Ljava/util/List;,blocked
-Landroid/net/wifi/IWifiManager$Default;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;,blocked
+Landroid/net/wifi/IWifiManager$Default;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;,blocked
+Landroid/net/wifi/IWifiManager$Default;->getPrivilegedConnectedNetwork(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/net/wifi/WifiConfiguration;,blocked
 Landroid/net/wifi/IWifiManager$Default;->getScanResults(Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;,blocked
 Landroid/net/wifi/IWifiManager$Default;->getSoftApConfiguration()Landroid/net/wifi/SoftApConfiguration;,blocked
+Landroid/net/wifi/IWifiManager$Default;->getSsidsAllowlist(Ljava/lang/String;)Ljava/util/List;,blocked
+Landroid/net/wifi/IWifiManager$Default;->getStaConcurrencyForMultiInternetMode()I,blocked
 Landroid/net/wifi/IWifiManager$Default;->getSupportedFeatures()J,blocked
 Landroid/net/wifi/IWifiManager$Default;->getUsableChannels(III)Ljava/util/List;,blocked
 Landroid/net/wifi/IWifiManager$Default;->getVerboseLoggingLevel()I,blocked
@@ -605,13 +812,19 @@
 Landroid/net/wifi/IWifiManager$Default;->isMulticastEnabled()Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->isScanAlwaysAvailable()Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->isScanThrottleEnabled()Z,blocked
+Landroid/net/wifi/IWifiManager$Default;->isWifiPasspointEnabled()Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->isWifiStandardSupported(I)Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->matchProviderWithCurrentNetwork(Ljava/lang/String;)I,blocked
+Landroid/net/wifi/IWifiManager$Default;->notifyMinimumRequiredWifiSecurityLevelChanged(I)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->notifyUserOfApBandConversion(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->notifyWifiSsidPolicyChanged(ILjava/util/List;)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->queryAutojoinGlobal(Landroid/net/wifi/IBooleanListener;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->queryPasspointIcon(JLjava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->reassociate(Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->reconnect(Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->registerCoexCallback(Landroid/net/wifi/ICoexCallback;)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->registerDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;Ljava/lang/String;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->registerLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->registerNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->registerScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->registerSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V,blocked
@@ -621,40 +834,50 @@
 Landroid/net/wifi/IWifiManager$Default;->releaseMulticastLock(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->releaseWifiLock(Landroid/os/IBinder;)Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->removeAppState(ILjava/lang/String;)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->removeCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[B)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->removeNetwork(ILjava/lang/String;)Z,blocked
-Landroid/net/wifi/IWifiManager$Default;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;)I,blocked
+Landroid/net/wifi/IWifiManager$Default;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;I)I,blocked
 Landroid/net/wifi/IWifiManager$Default;->removeNonCallerConfiguredNetworks(Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->removeOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->removePasspointConfiguration(Ljava/lang/String;Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->removeSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->replyToP2pInvitationReceivedDialog(IZLjava/lang/String;)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->replyToSimpleDialog(II)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->reportCreateInterfaceImpact(Ljava/lang/String;IZLandroid/net/wifi/IInterfaceCreationInfoCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->restartWifiSubsystem()V,blocked
 Landroid/net/wifi/IWifiManager$Default;->restoreBackupData([B)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->restoreSoftApBackupData([B)Landroid/net/wifi/SoftApConfiguration;,blocked
 Landroid/net/wifi/IWifiManager$Default;->restoreSupplicantBackupData([B[B)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->retrieveBackupData()[B,blocked
 Landroid/net/wifi/IWifiManager$Default;->retrieveSoftApBackupData()[B,blocked
-Landroid/net/wifi/IWifiManager$Default;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->setAutoWakeupEnabled(Z)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->setCarrierNetworkOffloadEnabled(IZZ)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->setCoexUnsafeChannels(Ljava/util/List;I)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->setDefaultCountryCode(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->setDeviceMobilityState(I)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->setEmergencyScanRequestInProgress(Z)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->setExternalPnoScanRequest(Landroid/os/IBinder;Landroid/net/wifi/IPnoScanResultsCallback;Ljava/util/List;[ILjava/lang/String;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->setMacRandomizationSettingPasspointEnabled(Ljava/lang/String;Z)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->setOneShotScreenOnConnectivityScanDelayMillis(I)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->setOverrideCountryCode(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->setPasspointMeteredOverride(Ljava/lang/String;I)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->setScanAlwaysAvailable(ZLjava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->setScanThrottleEnabled(Z)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->setScreenOnScanSchedule([I[I)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->setSoftApConfiguration(Landroid/net/wifi/SoftApConfiguration;Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/IWifiManager$Default;->setSsidsAllowlist(Ljava/lang/String;Ljava/util/List;)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->setStaConcurrencyForMultiInternetMode(I)Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->setWifiApConfiguration(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->setWifiConnectedNetworkScorer(Landroid/os/IBinder;Landroid/net/wifi/IWifiConnectedNetworkScorer;)Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->setWifiEnabled(Ljava/lang/String;Z)Z,blocked
+Landroid/net/wifi/IWifiManager$Default;->setWifiPasspointEnabled(Z)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->setWifiScoringEnabled(Z)Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->startDppAsConfiguratorInitiator(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;IILandroid/net/wifi/IDppCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->startDppAsEnrolleeInitiator(Landroid/os/IBinder;Ljava/lang/String;Landroid/net/wifi/IDppCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->startDppAsEnrolleeResponder(Landroid/os/IBinder;Ljava/lang/String;ILandroid/net/wifi/IDppCallback;)V,blocked
-Landroid/net/wifi/IWifiManager$Default;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;)I,blocked
+Landroid/net/wifi/IWifiManager$Default;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;Landroid/os/Bundle;)I,blocked
 Landroid/net/wifi/IWifiManager$Default;->startRestrictingAutoJoinToSubscriptionId(I)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->startScan(Ljava/lang/String;Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->startSoftAp(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z,blocked
@@ -667,6 +890,8 @@
 Landroid/net/wifi/IWifiManager$Default;->stopSoftAp()Z,blocked
 Landroid/net/wifi/IWifiManager$Default;->stopWatchLocalOnlyHotspot()V,blocked
 Landroid/net/wifi/IWifiManager$Default;->unregisterCoexCallback(Landroid/net/wifi/ICoexCallback;)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->unregisterDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;)V,blocked
+Landroid/net/wifi/IWifiManager$Default;->unregisterLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->unregisterNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->unregisterScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Default;->unregisterSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V,blocked
@@ -679,9 +904,10 @@
 Landroid/net/wifi/IWifiManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,unsupported
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->acquireMulticastLock(Landroid/os/IBinder;Ljava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->acquireWifiLock(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/WorkSource;)Z,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->addCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[BLjava/util/List;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->addNetworkSuggestions(Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)I,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->addOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V,blocked
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)I,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;Landroid/os/Bundle;)I,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->addOrUpdateNetworkPrivileged(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Landroid/net/wifi/WifiManager$AddNetworkResult;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->addOrUpdatePasspointConfiguration(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->addSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V,blocked
@@ -691,9 +917,10 @@
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->allowAutojoinPasspoint(Ljava/lang/String;Z)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->calculateSignalLevel(I)I,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->clearExternalPnoScanRequest()V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->clearOverrideCountryCode()V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->clearWifiConnectedNetworkScorer()V,blocked
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->disableEphemeralNetwork(Ljava/lang/String;Ljava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->disableNetwork(ILjava/lang/String;)Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->disconnect(Ljava/lang/String;)Z,blocked
@@ -708,20 +935,25 @@
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getAllMatchingPasspointProfilesForScanResults(Ljava/util/List;)Ljava/util/Map;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Z)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getConnectionInfo(Ljava/lang/String;Ljava/lang/String;)Landroid/net/wifi/WifiInfo;,blocked
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->getCountryCode()Ljava/lang/String;,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getCountryCode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getCurrentNetwork()Landroid/net/Network;,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getCurrentNetworkWpsNfcConfigurationToken()Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getDhcpInfo(Ljava/lang/String;)Landroid/net/DhcpInfo;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getFactoryMacAddresses()[Ljava/lang/String;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getLastCallerInfoForApi(ILandroid/net/wifi/ILastCallerListener;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getMatchingOsuProviders(Ljava/util/List;)Ljava/util/Map;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getMatchingPasspointConfigsForOsuProviders(Ljava/util/List;)Ljava/util/Map;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getMatchingScanResults(Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getNetworkSuggestions(Ljava/lang/String;)Ljava/util/List;,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getOemPrivilegedWifiAdminPackages()[Ljava/lang/String;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getPasspointConfigurations(Ljava/lang/String;)Ljava/util/List;,blocked
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getPrivilegedConnectedNetwork(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/net/wifi/WifiConfiguration;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getScanResults(Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getSoftApConfiguration()Landroid/net/wifi/SoftApConfiguration;,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getSsidsAllowlist(Ljava/lang/String;)Ljava/util/List;,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getStaConcurrencyForMultiInternetMode()I,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getSupportedFeatures()J,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getUsableChannels(III)Ljava/util/List;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getVerboseLoggingLevel()I,lo-prio,max-target-o
@@ -742,14 +974,20 @@
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->isMulticastEnabled()Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->isScanAlwaysAvailable()Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->isScanThrottleEnabled()Z,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->isWifiPasspointEnabled()Z,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->isWifiStandardSupported(I)Z,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->matchProviderWithCurrentNetwork(Ljava/lang/String;)I,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->notifyMinimumRequiredWifiSecurityLevelChanged(I)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->notifyUserOfApBandConversion(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->notifyWifiSsidPolicyChanged(ILjava/util/List;)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->queryAutojoinGlobal(Landroid/net/wifi/IBooleanListener;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->queryPasspointIcon(JLjava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->reassociate(Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->reconnect(Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->registerCoexCallback(Landroid/net/wifi/ICoexCallback;)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->registerDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;Ljava/lang/String;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->registerLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->registerNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->registerScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->registerSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V,blocked
@@ -759,41 +997,50 @@
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->releaseMulticastLock(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->releaseWifiLock(Landroid/os/IBinder;)Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeAppState(ILjava/lang/String;)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[B)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeNetwork(ILjava/lang/String;)Z,lo-prio,max-target-o
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;)I,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;I)I,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeNonCallerConfiguredNetworks(Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removePasspointConfiguration(Ljava/lang/String;Ljava/lang/String;)Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->replyToP2pInvitationReceivedDialog(IZLjava/lang/String;)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->replyToSimpleDialog(II)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->reportCreateInterfaceImpact(Ljava/lang/String;IZLandroid/net/wifi/IInterfaceCreationInfoCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->restartWifiSubsystem()V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->restoreBackupData([B)V,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->restoreSoftApBackupData([B)Landroid/net/wifi/SoftApConfiguration;,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->restoreSupplicantBackupData([B[B)V,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->retrieveBackupData()[B,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->retrieveSoftApBackupData()[B,blocked
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IWifiManager;,blocked
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setAutoWakeupEnabled(Z)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setCarrierNetworkOffloadEnabled(IZZ)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setCoexUnsafeChannels(Ljava/util/List;I)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setDefaultCountryCode(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setDeviceMobilityState(I)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setEmergencyScanRequestInProgress(Z)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->setExternalPnoScanRequest(Landroid/os/IBinder;Landroid/net/wifi/IPnoScanResultsCallback;Ljava/util/List;[ILjava/lang/String;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setMacRandomizationSettingPasspointEnabled(Ljava/lang/String;Z)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->setOneShotScreenOnConnectivityScanDelayMillis(I)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setOverrideCountryCode(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setPasspointMeteredOverride(Ljava/lang/String;I)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setScanAlwaysAvailable(ZLjava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setScanThrottleEnabled(Z)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->setScreenOnScanSchedule([I[I)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setSoftApConfiguration(Landroid/net/wifi/SoftApConfiguration;Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->setSsidsAllowlist(Ljava/lang/String;Ljava/util/List;)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->setStaConcurrencyForMultiInternetMode(I)Z,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setWifiApConfiguration(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setWifiConnectedNetworkScorer(Landroid/os/IBinder;Landroid/net/wifi/IWifiConnectedNetworkScorer;)Z,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setWifiEnabled(Ljava/lang/String;Z)Z,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->setWifiPasspointEnabled(Z)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setWifiScoringEnabled(Z)Z,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->startDppAsConfiguratorInitiator(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;IILandroid/net/wifi/IDppCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->startDppAsEnrolleeInitiator(Landroid/os/IBinder;Ljava/lang/String;Landroid/net/wifi/IDppCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->startDppAsEnrolleeResponder(Landroid/os/IBinder;Ljava/lang/String;ILandroid/net/wifi/IDppCallback;)V,blocked
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;)I,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;Landroid/os/Bundle;)I,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->startRestrictingAutoJoinToSubscriptionId(I)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->startScan(Ljava/lang/String;Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->startSoftAp(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z,blocked
@@ -806,6 +1053,8 @@
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->stopSoftAp()Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->stopWatchLocalOnlyHotspot()V,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->unregisterCoexCallback(Landroid/net/wifi/ICoexCallback;)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->unregisterDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;)V,blocked
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->unregisterLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->unregisterNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->unregisterScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V,blocked
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->unregisterSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V,blocked
@@ -819,6 +1068,7 @@
 Landroid/net/wifi/IWifiManager$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_acquireMulticastLock:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_acquireWifiLock:I,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_addCustomDhcpOptions:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_addNetworkSuggestions:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_addOnWifiUsabilityStatsListener:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_addOrUpdateNetwork:I,lo-prio,max-target-o
@@ -830,6 +1080,7 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_allowAutojoinGlobal:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_allowAutojoinPasspoint:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_calculateSignalLevel:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_clearExternalPnoScanRequest:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_clearOverrideCountryCode:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_clearWifiConnectedNetworkScorer:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_connect:I,blocked
@@ -852,14 +1103,19 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getCurrentNetworkWpsNfcConfigurationToken:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getDhcpInfo:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getFactoryMacAddresses:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getLastCallerInfoForApi:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getMatchingOsuProviders:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getMatchingPasspointConfigsForOsuProviders:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getMatchingScanResults:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getNetworkSuggestions:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getOemPrivilegedWifiAdminPackages:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getPasspointConfigurations:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getPrivilegedConfiguredNetworks:I,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getPrivilegedConnectedNetwork:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getScanResults:I,lo-prio,max-target-r
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getSoftApConfiguration:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getSsidsAllowlist:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getStaConcurrencyForMultiInternetMode:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getSupportedFeatures:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getUsableChannels:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getVerboseLoggingLevel:I,lo-prio,max-target-o
@@ -880,13 +1136,19 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_isMulticastEnabled:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_isScanAlwaysAvailable:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_isScanThrottleEnabled:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_isWifiPasspointEnabled:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_isWifiStandardSupported:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_matchProviderWithCurrentNetwork:I,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_notifyMinimumRequiredWifiSecurityLevelChanged:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_notifyUserOfApBandConversion:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_notifyWifiSsidPolicyChanged:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_queryAutojoinGlobal:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_queryPasspointIcon:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_reassociate:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_reconnect:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_registerCoexCallback:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_registerDriverCountryCodeChangedListener:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_registerLocalOnlyHotspotSoftApCallback:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_registerNetworkRequestMatchCallback:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_registerScanResultsCallback:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_registerSoftApCallback:I,lo-prio,max-target-o
@@ -896,6 +1158,7 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_releaseMulticastLock:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_releaseWifiLock:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeAppState:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeCustomDhcpOptions:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeNetwork:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeNetworkSuggestions:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeNonCallerConfiguredNetworks:I,blocked
@@ -903,6 +1166,9 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removePasspointConfiguration:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeSuggestionUserApprovalStatusListener:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeWifiVerboseLoggingStatusChangedListener:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_replyToP2pInvitationReceivedDialog:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_replyToSimpleDialog:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_reportCreateInterfaceImpact:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_restartWifiSubsystem:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_restoreBackupData:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_restoreSoftApBackupData:I,blocked
@@ -916,15 +1182,21 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setDefaultCountryCode:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setDeviceMobilityState:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setEmergencyScanRequestInProgress:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setExternalPnoScanRequest:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setMacRandomizationSettingPasspointEnabled:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setOneShotScreenOnConnectivityScanDelayMillis:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setOverrideCountryCode:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setPasspointMeteredOverride:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setScanAlwaysAvailable:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setScanThrottleEnabled:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setScreenOnScanSchedule:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setSoftApConfiguration:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setSsidsAllowlist:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setStaConcurrencyForMultiInternetMode:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setWifiApConfiguration:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setWifiConnectedNetworkScorer:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setWifiEnabled:I,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setWifiPasspointEnabled:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setWifiScoringEnabled:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_startDppAsConfiguratorInitiator:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_startDppAsEnrolleeInitiator:I,blocked
@@ -942,6 +1214,8 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_stopSoftAp:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_stopWatchLocalOnlyHotspot:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_unregisterCoexCallback:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_unregisterDriverCountryCodeChangedListener:I,blocked
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_unregisterLocalOnlyHotspotSoftApCallback:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_unregisterNetworkRequestMatchCallback:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_unregisterScanResultsCallback:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_unregisterSoftApCallback:I,lo-prio,max-target-o
@@ -953,14 +1227,13 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_updateWifiUsabilityScore:I,blocked
 Landroid/net/wifi/IWifiManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IWifiManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiManager;,unsupported
-Landroid/net/wifi/IWifiManager$Stub;->getDefaultImpl()Landroid/net/wifi/IWifiManager;,blocked
 Landroid/net/wifi/IWifiManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/IWifiManager$Stub;->setDefaultImpl(Landroid/net/wifi/IWifiManager;)Z,blocked
 Landroid/net/wifi/IWifiManager;->acquireMulticastLock(Landroid/os/IBinder;Ljava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->acquireWifiLock(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/WorkSource;)Z,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager;->addCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[BLjava/util/List;)V,blocked
 Landroid/net/wifi/IWifiManager;->addNetworkSuggestions(Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)I,blocked
 Landroid/net/wifi/IWifiManager;->addOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V,blocked
-Landroid/net/wifi/IWifiManager;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)I,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;Landroid/os/Bundle;)I,blocked
 Landroid/net/wifi/IWifiManager;->addOrUpdateNetworkPrivileged(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Landroid/net/wifi/WifiManager$AddNetworkResult;,blocked
 Landroid/net/wifi/IWifiManager;->addOrUpdatePasspointConfiguration(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->addSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V,blocked
@@ -969,9 +1242,10 @@
 Landroid/net/wifi/IWifiManager;->allowAutojoinGlobal(Z)V,blocked
 Landroid/net/wifi/IWifiManager;->allowAutojoinPasspoint(Ljava/lang/String;Z)V,blocked
 Landroid/net/wifi/IWifiManager;->calculateSignalLevel(I)I,blocked
+Landroid/net/wifi/IWifiManager;->clearExternalPnoScanRequest()V,blocked
 Landroid/net/wifi/IWifiManager;->clearOverrideCountryCode()V,blocked
 Landroid/net/wifi/IWifiManager;->clearWifiConnectedNetworkScorer()V,blocked
-Landroid/net/wifi/IWifiManager;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;)V,blocked
+Landroid/net/wifi/IWifiManager;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager;->disableEphemeralNetwork(Ljava/lang/String;Ljava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->disableNetwork(ILjava/lang/String;)Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->disconnect(Ljava/lang/String;)Z,blocked
@@ -986,19 +1260,24 @@
 Landroid/net/wifi/IWifiManager;->getAllMatchingPasspointProfilesForScanResults(Ljava/util/List;)Ljava/util/Map;,blocked
 Landroid/net/wifi/IWifiManager;->getConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Z)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;,blocked
 Landroid/net/wifi/IWifiManager;->getConnectionInfo(Ljava/lang/String;Ljava/lang/String;)Landroid/net/wifi/WifiInfo;,blocked
-Landroid/net/wifi/IWifiManager;->getCountryCode()Ljava/lang/String;,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager;->getCountryCode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,blocked
 Landroid/net/wifi/IWifiManager;->getCurrentNetwork()Landroid/net/Network;,max-target-r
 Landroid/net/wifi/IWifiManager;->getCurrentNetworkWpsNfcConfigurationToken()Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->getDhcpInfo(Ljava/lang/String;)Landroid/net/DhcpInfo;,blocked
 Landroid/net/wifi/IWifiManager;->getFactoryMacAddresses()[Ljava/lang/String;,blocked
+Landroid/net/wifi/IWifiManager;->getLastCallerInfoForApi(ILandroid/net/wifi/ILastCallerListener;)V,blocked
 Landroid/net/wifi/IWifiManager;->getMatchingOsuProviders(Ljava/util/List;)Ljava/util/Map;,blocked
 Landroid/net/wifi/IWifiManager;->getMatchingPasspointConfigsForOsuProviders(Ljava/util/List;)Ljava/util/Map;,blocked
 Landroid/net/wifi/IWifiManager;->getMatchingScanResults(Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map;,blocked
 Landroid/net/wifi/IWifiManager;->getNetworkSuggestions(Ljava/lang/String;)Ljava/util/List;,blocked
+Landroid/net/wifi/IWifiManager;->getOemPrivilegedWifiAdminPackages()[Ljava/lang/String;,blocked
 Landroid/net/wifi/IWifiManager;->getPasspointConfigurations(Ljava/lang/String;)Ljava/util/List;,blocked
-Landroid/net/wifi/IWifiManager;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;,blocked
+Landroid/net/wifi/IWifiManager;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;,blocked
+Landroid/net/wifi/IWifiManager;->getPrivilegedConnectedNetwork(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/net/wifi/WifiConfiguration;,blocked
 Landroid/net/wifi/IWifiManager;->getScanResults(Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;,blocked
 Landroid/net/wifi/IWifiManager;->getSoftApConfiguration()Landroid/net/wifi/SoftApConfiguration;,blocked
+Landroid/net/wifi/IWifiManager;->getSsidsAllowlist(Ljava/lang/String;)Ljava/util/List;,blocked
+Landroid/net/wifi/IWifiManager;->getStaConcurrencyForMultiInternetMode()I,blocked
 Landroid/net/wifi/IWifiManager;->getSupportedFeatures()J,blocked
 Landroid/net/wifi/IWifiManager;->getUsableChannels(III)Ljava/util/List;,blocked
 Landroid/net/wifi/IWifiManager;->getVerboseLoggingLevel()I,lo-prio,max-target-o
@@ -1019,13 +1298,19 @@
 Landroid/net/wifi/IWifiManager;->isMulticastEnabled()Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->isScanAlwaysAvailable()Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->isScanThrottleEnabled()Z,blocked
+Landroid/net/wifi/IWifiManager;->isWifiPasspointEnabled()Z,blocked
 Landroid/net/wifi/IWifiManager;->isWifiStandardSupported(I)Z,blocked
 Landroid/net/wifi/IWifiManager;->matchProviderWithCurrentNetwork(Ljava/lang/String;)I,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager;->notifyMinimumRequiredWifiSecurityLevelChanged(I)V,blocked
 Landroid/net/wifi/IWifiManager;->notifyUserOfApBandConversion(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/IWifiManager;->notifyWifiSsidPolicyChanged(ILjava/util/List;)V,blocked
+Landroid/net/wifi/IWifiManager;->queryAutojoinGlobal(Landroid/net/wifi/IBooleanListener;)V,blocked
 Landroid/net/wifi/IWifiManager;->queryPasspointIcon(JLjava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->reassociate(Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager;->reconnect(Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager;->registerCoexCallback(Landroid/net/wifi/ICoexCallback;)V,blocked
+Landroid/net/wifi/IWifiManager;->registerDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;Ljava/lang/String;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/IWifiManager;->registerLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V,blocked
 Landroid/net/wifi/IWifiManager;->registerNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V,blocked
 Landroid/net/wifi/IWifiManager;->registerScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V,blocked
 Landroid/net/wifi/IWifiManager;->registerSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V,blocked
@@ -1035,40 +1320,50 @@
 Landroid/net/wifi/IWifiManager;->releaseMulticastLock(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager;->releaseWifiLock(Landroid/os/IBinder;)Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->removeAppState(ILjava/lang/String;)V,blocked
+Landroid/net/wifi/IWifiManager;->removeCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[B)V,blocked
 Landroid/net/wifi/IWifiManager;->removeNetwork(ILjava/lang/String;)Z,lo-prio,max-target-o
-Landroid/net/wifi/IWifiManager;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;)I,blocked
+Landroid/net/wifi/IWifiManager;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;I)I,blocked
 Landroid/net/wifi/IWifiManager;->removeNonCallerConfiguredNetworks(Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager;->removeOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V,blocked
 Landroid/net/wifi/IWifiManager;->removePasspointConfiguration(Ljava/lang/String;Ljava/lang/String;)Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->removeSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;)V,blocked
+Landroid/net/wifi/IWifiManager;->replyToP2pInvitationReceivedDialog(IZLjava/lang/String;)V,blocked
+Landroid/net/wifi/IWifiManager;->replyToSimpleDialog(II)V,blocked
+Landroid/net/wifi/IWifiManager;->reportCreateInterfaceImpact(Ljava/lang/String;IZLandroid/net/wifi/IInterfaceCreationInfoCallback;)V,blocked
 Landroid/net/wifi/IWifiManager;->restartWifiSubsystem()V,blocked
 Landroid/net/wifi/IWifiManager;->restoreBackupData([B)V,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->restoreSoftApBackupData([B)Landroid/net/wifi/SoftApConfiguration;,blocked
 Landroid/net/wifi/IWifiManager;->restoreSupplicantBackupData([B[B)V,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->retrieveBackupData()[B,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->retrieveSoftApBackupData()[B,blocked
-Landroid/net/wifi/IWifiManager;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;)V,blocked
+Landroid/net/wifi/IWifiManager;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager;->setAutoWakeupEnabled(Z)V,blocked
 Landroid/net/wifi/IWifiManager;->setCarrierNetworkOffloadEnabled(IZZ)V,blocked
 Landroid/net/wifi/IWifiManager;->setCoexUnsafeChannels(Ljava/util/List;I)V,blocked
 Landroid/net/wifi/IWifiManager;->setDefaultCountryCode(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager;->setDeviceMobilityState(I)V,blocked
 Landroid/net/wifi/IWifiManager;->setEmergencyScanRequestInProgress(Z)V,blocked
+Landroid/net/wifi/IWifiManager;->setExternalPnoScanRequest(Landroid/os/IBinder;Landroid/net/wifi/IPnoScanResultsCallback;Ljava/util/List;[ILjava/lang/String;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager;->setMacRandomizationSettingPasspointEnabled(Ljava/lang/String;Z)V,blocked
+Landroid/net/wifi/IWifiManager;->setOneShotScreenOnConnectivityScanDelayMillis(I)V,blocked
 Landroid/net/wifi/IWifiManager;->setOverrideCountryCode(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager;->setPasspointMeteredOverride(Ljava/lang/String;I)V,blocked
 Landroid/net/wifi/IWifiManager;->setScanAlwaysAvailable(ZLjava/lang/String;)V,blocked
 Landroid/net/wifi/IWifiManager;->setScanThrottleEnabled(Z)V,blocked
+Landroid/net/wifi/IWifiManager;->setScreenOnScanSchedule([I[I)V,blocked
 Landroid/net/wifi/IWifiManager;->setSoftApConfiguration(Landroid/net/wifi/SoftApConfiguration;Ljava/lang/String;)Z,blocked
+Landroid/net/wifi/IWifiManager;->setSsidsAllowlist(Ljava/lang/String;Ljava/util/List;)V,blocked
+Landroid/net/wifi/IWifiManager;->setStaConcurrencyForMultiInternetMode(I)Z,blocked
 Landroid/net/wifi/IWifiManager;->setWifiApConfiguration(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->setWifiConnectedNetworkScorer(Landroid/os/IBinder;Landroid/net/wifi/IWifiConnectedNetworkScorer;)Z,blocked
 Landroid/net/wifi/IWifiManager;->setWifiEnabled(Ljava/lang/String;Z)Z,lo-prio,max-target-o
+Landroid/net/wifi/IWifiManager;->setWifiPasspointEnabled(Z)V,blocked
 Landroid/net/wifi/IWifiManager;->setWifiScoringEnabled(Z)Z,blocked
 Landroid/net/wifi/IWifiManager;->startDppAsConfiguratorInitiator(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;IILandroid/net/wifi/IDppCallback;)V,blocked
 Landroid/net/wifi/IWifiManager;->startDppAsEnrolleeInitiator(Landroid/os/IBinder;Ljava/lang/String;Landroid/net/wifi/IDppCallback;)V,blocked
 Landroid/net/wifi/IWifiManager;->startDppAsEnrolleeResponder(Landroid/os/IBinder;Ljava/lang/String;ILandroid/net/wifi/IDppCallback;)V,blocked
-Landroid/net/wifi/IWifiManager;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;)I,blocked
+Landroid/net/wifi/IWifiManager;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;Landroid/os/Bundle;)I,blocked
 Landroid/net/wifi/IWifiManager;->startRestrictingAutoJoinToSubscriptionId(I)V,blocked
 Landroid/net/wifi/IWifiManager;->startScan(Ljava/lang/String;Ljava/lang/String;)Z,blocked
 Landroid/net/wifi/IWifiManager;->startSoftAp(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z,blocked
@@ -1081,6 +1376,8 @@
 Landroid/net/wifi/IWifiManager;->stopSoftAp()Z,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->stopWatchLocalOnlyHotspot()V,lo-prio,max-target-o
 Landroid/net/wifi/IWifiManager;->unregisterCoexCallback(Landroid/net/wifi/ICoexCallback;)V,blocked
+Landroid/net/wifi/IWifiManager;->unregisterDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;)V,blocked
+Landroid/net/wifi/IWifiManager;->unregisterLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V,blocked
 Landroid/net/wifi/IWifiManager;->unregisterNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V,blocked
 Landroid/net/wifi/IWifiManager;->unregisterScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V,blocked
 Landroid/net/wifi/IWifiManager;->unregisterSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V,blocked
@@ -1094,24 +1391,25 @@
 Landroid/net/wifi/IWifiScanner$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IWifiScanner$Default;->getAvailableChannels(ILjava/lang/String;Ljava/lang/String;)Landroid/os/Bundle;,blocked
 Landroid/net/wifi/IWifiScanner$Default;->getMessenger()Landroid/os/Messenger;,blocked
+Landroid/net/wifi/IWifiScanner$Default;->isScanning()Z,blocked
 Landroid/net/wifi/IWifiScanner$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,unsupported
 Landroid/net/wifi/IWifiScanner$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IWifiScanner$Stub$Proxy;->getAvailableChannels(ILjava/lang/String;Ljava/lang/String;)Landroid/os/Bundle;,blocked
 Landroid/net/wifi/IWifiScanner$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/IWifiScanner$Stub$Proxy;->getMessenger()Landroid/os/Messenger;,lo-prio,max-target-o
+Landroid/net/wifi/IWifiScanner$Stub$Proxy;->isScanning()Z,blocked
 Landroid/net/wifi/IWifiScanner$Stub$Proxy;->mRemote:Landroid/os/IBinder;,unsupported
-Landroid/net/wifi/IWifiScanner$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IWifiScanner;,blocked
 Landroid/net/wifi/IWifiScanner$Stub;-><init>()V,unsupported
 Landroid/net/wifi/IWifiScanner$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/IWifiScanner$Stub;->TRANSACTION_getAvailableChannels:I,lo-prio,max-target-o
 Landroid/net/wifi/IWifiScanner$Stub;->TRANSACTION_getMessenger:I,lo-prio,max-target-o
+Landroid/net/wifi/IWifiScanner$Stub;->TRANSACTION_isScanning:I,blocked
 Landroid/net/wifi/IWifiScanner$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IWifiScanner$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiScanner;,unsupported
-Landroid/net/wifi/IWifiScanner$Stub;->getDefaultImpl()Landroid/net/wifi/IWifiScanner;,blocked
 Landroid/net/wifi/IWifiScanner$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/IWifiScanner$Stub;->setDefaultImpl(Landroid/net/wifi/IWifiScanner;)Z,blocked
 Landroid/net/wifi/IWifiScanner;->getAvailableChannels(ILjava/lang/String;Ljava/lang/String;)Landroid/os/Bundle;,blocked
 Landroid/net/wifi/IWifiScanner;->getMessenger()Landroid/os/Messenger;,lo-prio,max-target-o
+Landroid/net/wifi/IWifiScanner;->isScanning()Z,blocked
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Default;-><init>()V,blocked
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Default;->onStatusChanged(Z)V,blocked
@@ -1120,16 +1418,60 @@
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub$Proxy;->onStatusChanged(Z)V,blocked
-Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;,blocked
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;-><init>()V,blocked
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->TRANSACTION_onStatusChanged:I,blocked
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;,blocked
-Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->getDefaultImpl()Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;,blocked
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->setDefaultImpl(Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;)Z,blocked
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;->DESCRIPTOR:Ljava/lang/String;,blocked
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;->onStatusChanged(Z)V,blocked
+Landroid/net/wifi/MloLink$1;-><init>()V,blocked
+Landroid/net/wifi/MloLink$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/MloLink;,blocked
+Landroid/net/wifi/MloLink$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink$1;->newArray(I)[Landroid/net/wifi/MloLink;,blocked
+Landroid/net/wifi/MloLink$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->-$$Nest$fputmApMacAddress(Landroid/net/wifi/MloLink;Landroid/net/MacAddress;)V,blocked
+Landroid/net/wifi/MloLink;->-$$Nest$fputmBand(Landroid/net/wifi/MloLink;I)V,blocked
+Landroid/net/wifi/MloLink;->-$$Nest$fputmChannel(Landroid/net/wifi/MloLink;I)V,blocked
+Landroid/net/wifi/MloLink;->-$$Nest$fputmLinkId(Landroid/net/wifi/MloLink;I)V,blocked
+Landroid/net/wifi/MloLink;->-$$Nest$fputmStaMacAddress(Landroid/net/wifi/MloLink;Landroid/net/MacAddress;)V,blocked
+Landroid/net/wifi/MloLink;->-$$Nest$fputmState(Landroid/net/wifi/MloLink;I)V,blocked
+Landroid/net/wifi/MloLink;-><clinit>()V,blocked
+Landroid/net/wifi/MloLink;-><init>()V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;-><init>(Landroid/net/wifi/MloLink;J)V,blocked
+Landroid/net/wifi/MloLink;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->INVALID_MLO_LINK_ID:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->MAX_MLO_LINK_ID:I,blocked
+Landroid/net/wifi/MloLink;->MIN_MLO_LINK_ID:I,blocked
+Landroid/net/wifi/MloLink;->MLO_LINK_STATE_ACTIVE:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->MLO_LINK_STATE_IDLE:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->MLO_LINK_STATE_INVALID:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->MLO_LINK_STATE_UNASSOCIATED:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->getApMacAddress()Landroid/net/MacAddress;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->getBand()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->getChannel()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->getLinkId()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->getStaMacAddress()Landroid/net/MacAddress;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->getState()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->getStateString(I)Ljava/lang/String;,blocked
+Landroid/net/wifi/MloLink;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/MloLink;->isValidState(I)Z,blocked
+Landroid/net/wifi/MloLink;->mApMacAddress:Landroid/net/MacAddress;,blocked
+Landroid/net/wifi/MloLink;->mBand:I,blocked
+Landroid/net/wifi/MloLink;->mChannel:I,blocked
+Landroid/net/wifi/MloLink;->mLinkId:I,blocked
+Landroid/net/wifi/MloLink;->mStaMacAddress:Landroid/net/MacAddress;,blocked
+Landroid/net/wifi/MloLink;->mState:I,blocked
+Landroid/net/wifi/MloLink;->setApMacAddress(Landroid/net/MacAddress;)V,blocked
+Landroid/net/wifi/MloLink;->setBand(I)V,blocked
+Landroid/net/wifi/MloLink;->setChannel(I)V,blocked
+Landroid/net/wifi/MloLink;->setLinkId(I)V,blocked
+Landroid/net/wifi/MloLink;->setStaMacAddress(Landroid/net/MacAddress;)V,blocked
+Landroid/net/wifi/MloLink;->setState(I)V,blocked
+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/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
@@ -1359,19 +1701,24 @@
 Landroid/net/wifi/ScanResult$InformationElement$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult$InformationElement;-><clinit>()V,blocked
 Landroid/net/wifi/ScanResult$InformationElement;-><init>()V,lo-prio,max-target-o
-Landroid/net/wifi/ScanResult$InformationElement;-><init>(II[B)V,blocked
+Landroid/net/wifi/ScanResult$InformationElement;-><init>(II[B)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult$InformationElement;-><init>(Landroid/net/wifi/ScanResult$InformationElement;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult$InformationElement;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult$InformationElement;->EID_BSS_LOAD:I,max-target-r
+Landroid/net/wifi/ScanResult$InformationElement;->EID_COUNTRY:I,blocked
 Landroid/net/wifi/ScanResult$InformationElement;->EID_ERP:I,max-target-r
 Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_CAPS:I,max-target-r
 Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_SUPPORTED_RATES:I,max-target-r
 Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENSION_PRESENT:I,blocked
+Landroid/net/wifi/ScanResult$InformationElement;->EID_EXT_EHT_CAPABILITIES:I,blocked
+Landroid/net/wifi/ScanResult$InformationElement;->EID_EXT_EHT_OPERATION:I,blocked
 Landroid/net/wifi/ScanResult$InformationElement;->EID_EXT_HE_CAPABILITIES:I,blocked
 Landroid/net/wifi/ScanResult$InformationElement;->EID_EXT_HE_OPERATION:I,blocked
+Landroid/net/wifi/ScanResult$InformationElement;->EID_EXT_MULTI_LINK:I,blocked
 Landroid/net/wifi/ScanResult$InformationElement;->EID_HT_CAPABILITIES:I,lo-prio,max-target-o
 Landroid/net/wifi/ScanResult$InformationElement;->EID_HT_OPERATION:I,max-target-r
 Landroid/net/wifi/ScanResult$InformationElement;->EID_INTERWORKING:I,max-target-r
+Landroid/net/wifi/ScanResult$InformationElement;->EID_RNR:I,blocked
 Landroid/net/wifi/ScanResult$InformationElement;->EID_ROAMING_CONSORTIUM:I,max-target-r
 Landroid/net/wifi/ScanResult$InformationElement;->EID_RSN:I,max-target-r
 Landroid/net/wifi/ScanResult$InformationElement;->EID_SSID:I,max-target-r
@@ -1396,6 +1743,10 @@
 Landroid/net/wifi/ScanResult$RadioChainInfo;->id:I,lo-prio,max-target-o
 Landroid/net/wifi/ScanResult$RadioChainInfo;->level:I,lo-prio,max-target-o
 Landroid/net/wifi/ScanResult$RadioChainInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->-$$Nest$fputmAffiliatedMloLinks(Landroid/net/wifi/ScanResult;Ljava/util/List;)V,blocked
+Landroid/net/wifi/ScanResult;->-$$Nest$fputmApMldMacAddress(Landroid/net/wifi/ScanResult;Landroid/net/MacAddress;)V,blocked
+Landroid/net/wifi/ScanResult;->-$$Nest$fputmApMloLinkId(Landroid/net/wifi/ScanResult;I)V,blocked
+Landroid/net/wifi/ScanResult;->-$$Nest$fputmWifiStandard(Landroid/net/wifi/ScanResult;I)V,blocked
 Landroid/net/wifi/ScanResult;-><clinit>()V,blocked
 Landroid/net/wifi/ScanResult;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;-><init>(Landroid/net/wifi/ScanResult;)V,public-api,sdk,system-api,test-api
@@ -1425,6 +1776,7 @@
 Landroid/net/wifi/ScanResult;->BSSID:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->CHANNEL_WIDTH_160MHZ:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->CHANNEL_WIDTH_20MHZ:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->CHANNEL_WIDTH_320MHZ:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->CHANNEL_WIDTH_40MHZ:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->CHANNEL_WIDTH_80MHZ:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->CHANNEL_WIDTH_80MHZ_PLUS_MHZ:I,public-api,sdk,system-api,test-api
@@ -1441,6 +1793,7 @@
 Landroid/net/wifi/ScanResult;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->FLAG_80211mc_RESPONDER:J,lo-prio,max-target-o
 Landroid/net/wifi/ScanResult;->FLAG_PASSPOINT_NETWORK:J,lo-prio,max-target-o
+Landroid/net/wifi/ScanResult;->KEY_MGMT_DPP:I,blocked
 Landroid/net/wifi/ScanResult;->KEY_MGMT_EAP:I,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->KEY_MGMT_EAP_SHA256:I,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->KEY_MGMT_EAP_SUITE_B_192:I,sdk,system-api,test-api
@@ -1459,6 +1812,11 @@
 Landroid/net/wifi/ScanResult;->KEY_MGMT_UNKNOWN:I,blocked
 Landroid/net/wifi/ScanResult;->KEY_MGMT_WAPI_CERT:I,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->KEY_MGMT_WAPI_PSK:I,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->PREAMBLE_EHT:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->PREAMBLE_HE:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->PREAMBLE_HT:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->PREAMBLE_LEGACY:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->PREAMBLE_VHT:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->PROTOCOL_NONE:I,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->PROTOCOL_OSEN:I,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->PROTOCOL_RSN:I,sdk,system-api,test-api
@@ -1473,10 +1831,10 @@
 Landroid/net/wifi/ScanResult;->WIFI_STANDARD_11AC:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->WIFI_STANDARD_11AD:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->WIFI_STANDARD_11AX:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->WIFI_STANDARD_11BE:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->WIFI_STANDARD_11N:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->WIFI_STANDARD_LEGACY:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->WIFI_STANDARD_UNKNOWN:I,public-api,sdk,system-api,test-api
-Landroid/net/wifi/ScanResult;->access$002(Landroid/net/wifi/ScanResult;I)I,blocked
 Landroid/net/wifi/ScanResult;->anqpDomainId:I,unsupported
 Landroid/net/wifi/ScanResult;->anqpElements:[Landroid/net/wifi/AnqpInformationElement;,lo-prio,max-target-o
 Landroid/net/wifi/ScanResult;->anqpLines:Ljava/util/List;,unsupported
@@ -1492,7 +1850,14 @@
 Landroid/net/wifi/ScanResult;->distanceSdCm:I,unsupported
 Landroid/net/wifi/ScanResult;->flags:J,unsupported
 Landroid/net/wifi/ScanResult;->frequency:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->getAffiliatedMloLinks()Ljava/util/List;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->getApMldMacAddress()Landroid/net/MacAddress;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->getApMloLinkId()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->getBand()I,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->getBandFromOpClass(II)I,blocked
 Landroid/net/wifi/ScanResult;->getInformationElements()Ljava/util/List;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->getSecurityTypes()[I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->getWifiSsid()Landroid/net/wifi/WifiSsid;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->getWifiStandard()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->hessid:J,unsupported
 Landroid/net/wifi/ScanResult;->ifaceName:Ljava/lang/String;,blocked
@@ -1509,30 +1874,61 @@
 Landroid/net/wifi/ScanResult;->is6GhzPsc()Z,blocked
 Landroid/net/wifi/ScanResult;->is80211McRTTResponder:Z,max-target-r
 Landroid/net/wifi/ScanResult;->is80211mcResponder()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->isHiddenSsid(Landroid/net/wifi/WifiSsid;)Z,blocked
 Landroid/net/wifi/ScanResult;->isPasspointNetwork()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->level:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->mAffiliatedMloLinks:Ljava/util/List;,blocked
+Landroid/net/wifi/ScanResult;->mApMldMacAddress:Landroid/net/MacAddress;,blocked
+Landroid/net/wifi/ScanResult;->mApMloLinkId:I,blocked
 Landroid/net/wifi/ScanResult;->mWifiStandard:I,blocked
 Landroid/net/wifi/ScanResult;->numUsage:I,unsupported
 Landroid/net/wifi/ScanResult;->operatorFriendlyName:Ljava/lang/CharSequence;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->radioChainInfos:[Landroid/net/wifi/ScanResult$RadioChainInfo;,lo-prio,max-target-o
 Landroid/net/wifi/ScanResult;->seen:J,unsupported
+Landroid/net/wifi/ScanResult;->setAffiliatedMloLinks(Ljava/util/List;)V,blocked
+Landroid/net/wifi/ScanResult;->setApMldMacAddress(Landroid/net/MacAddress;)V,blocked
+Landroid/net/wifi/ScanResult;->setApMloLinkId(I)V,blocked
 Landroid/net/wifi/ScanResult;->setFlag(J)V,lo-prio,max-target-o
+Landroid/net/wifi/ScanResult;->setWifiSsid(Landroid/net/wifi/WifiSsid;)V,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->setWifiStandard(I)V,blocked
 Landroid/net/wifi/ScanResult;->timestamp:J,public-api,sdk,system-api,test-api
+Landroid/net/wifi/ScanResult;->toBand(I)I,blocked
 Landroid/net/wifi/ScanResult;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->untrusted:Z,removed,unsupported
 Landroid/net/wifi/ScanResult;->venueName:Ljava/lang/CharSequence;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/ScanResult;->wifiSsid:Landroid/net/wifi/WifiSsid;,unsupported
 Landroid/net/wifi/ScanResult;->wifiStandardToString(I)Ljava/lang/String;,blocked
 Landroid/net/wifi/ScanResult;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SecurityParams$1;-><init>()V,blocked
+Landroid/net/wifi/SecurityParams$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/SecurityParams;,blocked
+Landroid/net/wifi/SecurityParams$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SecurityParams$1;->newArray(I)[Landroid/net/wifi/SecurityParams;,blocked
+Landroid/net/wifi/SecurityParams$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedAuthAlgorithms(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V,blocked
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedGroupCiphers(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V,blocked
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedGroupManagementCiphers(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V,blocked
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedKeyManagement(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V,blocked
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedPairwiseCiphers(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V,blocked
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedProtocols(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V,blocked
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedSuiteBCiphers(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V,blocked
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmEnabled(Landroid/net/wifi/SecurityParams;Z)V,blocked
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmIsAddedByAutoUpgrade(Landroid/net/wifi/SecurityParams;Z)V,blocked
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmIsSaeH2eOnlyMode(Landroid/net/wifi/SecurityParams;Z)V,blocked
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmIsSaePkOnlyMode(Landroid/net/wifi/SecurityParams;Z)V,blocked
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmRequirePmf(Landroid/net/wifi/SecurityParams;Z)V,blocked
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmSecurityType(Landroid/net/wifi/SecurityParams;I)V,blocked
+Landroid/net/wifi/SecurityParams;->-$$Nest$smreadBitSet(Landroid/os/Parcel;)Ljava/util/BitSet;,blocked
+Landroid/net/wifi/SecurityParams;-><clinit>()V,blocked
 Landroid/net/wifi/SecurityParams;-><init>()V,blocked
+Landroid/net/wifi/SecurityParams;-><init>(Landroid/net/wifi/SecurityParams-IA;)V,blocked
 Landroid/net/wifi/SecurityParams;-><init>(Landroid/net/wifi/SecurityParams;)V,blocked
+Landroid/net/wifi/SecurityParams;->CREATOR:Landroid/os/Parcelable$Creator;,blocked
 Landroid/net/wifi/SecurityParams;->PASSPOINT_R1:I,blocked
 Landroid/net/wifi/SecurityParams;->PASSPOINT_R2:I,blocked
 Landroid/net/wifi/SecurityParams;->PASSPOINT_R3:I,blocked
 Landroid/net/wifi/SecurityParams;->TAG:Ljava/lang/String;,blocked
+Landroid/net/wifi/SecurityParams;->createDppParams()Landroid/net/wifi/SecurityParams;,blocked
 Landroid/net/wifi/SecurityParams;->createEnhancedOpenParams()Landroid/net/wifi/SecurityParams;,blocked
-Landroid/net/wifi/SecurityParams;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/SecurityParams;,blocked
 Landroid/net/wifi/SecurityParams;->createOpenParams()Landroid/net/wifi/SecurityParams;,blocked
 Landroid/net/wifi/SecurityParams;->createOsenParams()Landroid/net/wifi/SecurityParams;,blocked
 Landroid/net/wifi/SecurityParams;->createPasspointParams(I)Landroid/net/wifi/SecurityParams;,blocked
@@ -1545,6 +1941,7 @@
 Landroid/net/wifi/SecurityParams;->createWpa3PersonalParams()Landroid/net/wifi/SecurityParams;,blocked
 Landroid/net/wifi/SecurityParams;->createWpaWpa2EnterpriseParams()Landroid/net/wifi/SecurityParams;,blocked
 Landroid/net/wifi/SecurityParams;->createWpaWpa2PersonalParams()Landroid/net/wifi/SecurityParams;,blocked
+Landroid/net/wifi/SecurityParams;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SecurityParams;->enableFils(ZZ)V,blocked
 Landroid/net/wifi/SecurityParams;->enableSaeH2eOnlyMode(Z)V,blocked
 Landroid/net/wifi/SecurityParams;->enableSaePkOnlyMode(Z)V,blocked
@@ -1589,12 +1986,13 @@
 Landroid/net/wifi/SecurityParams;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SecurityParams;->updateLegacyWifiConfiguration(Landroid/net/wifi/WifiConfiguration;)V,blocked
 Landroid/net/wifi/SecurityParams;->writeBitSet(Landroid/os/Parcel;Ljava/util/BitSet;)V,blocked
-Landroid/net/wifi/SecurityParams;->writeToParcel(Landroid/os/Parcel;I)V,blocked
+Landroid/net/wifi/SecurityParams;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApCapability$1;-><init>()V,blocked
 Landroid/net/wifi/SoftApCapability$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/SoftApCapability;,blocked
 Landroid/net/wifi/SoftApCapability$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApCapability$1;->newArray(I)[Landroid/net/wifi/SoftApCapability;,blocked
 Landroid/net/wifi/SoftApCapability$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SoftApCapability;->-$$Nest$fputmMaximumSupportedClientNumber(Landroid/net/wifi/SoftApCapability;I)V,blocked
 Landroid/net/wifi/SoftApCapability;-><clinit>()V,blocked
 Landroid/net/wifi/SoftApCapability;-><init>(J)V,blocked
 Landroid/net/wifi/SoftApCapability;-><init>(Landroid/net/wifi/SoftApCapability;)V,blocked
@@ -1607,71 +2005,123 @@
 Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_BAND_6G_SUPPORTED:J,sdk,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_CLIENT_FORCE_DISCONNECT:J,sdk,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_IEEE80211_AX:J,sdk,system-api,test-api
+Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_IEEE80211_BE:J,sdk,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_MAC_ADDRESS_CUSTOMIZATION:J,sdk,system-api,test-api
+Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_WPA3_OWE:J,sdk,system-api,test-api
+Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_WPA3_OWE_TRANSITION:J,sdk,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_WPA3_SAE:J,sdk,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->TAG:Ljava/lang/String;,blocked
-Landroid/net/wifi/SoftApCapability;->access$002(Landroid/net/wifi/SoftApCapability;I)I,blocked
 Landroid/net/wifi/SoftApCapability;->areFeaturesSupported(J)Z,sdk,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SoftApCapability;->getCountryCode()Ljava/lang/String;,blocked
 Landroid/net/wifi/SoftApCapability;->getMaxSupportedClients()I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->getSupportedChannelList(I)[I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SoftApCapability;->mCountryCodeFromDriver:Ljava/lang/String;,blocked
 Landroid/net/wifi/SoftApCapability;->mMaximumSupportedClientNumber:I,blocked
 Landroid/net/wifi/SoftApCapability;->mSupportedChannelListIn24g:[I,blocked
 Landroid/net/wifi/SoftApCapability;->mSupportedChannelListIn5g:[I,blocked
 Landroid/net/wifi/SoftApCapability;->mSupportedChannelListIn60g:[I,blocked
 Landroid/net/wifi/SoftApCapability;->mSupportedChannelListIn6g:[I,blocked
 Landroid/net/wifi/SoftApCapability;->mSupportedFeatures:J,blocked
+Landroid/net/wifi/SoftApCapability;->setCountryCode(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/SoftApCapability;->setMaxSupportedClients(I)V,blocked
 Landroid/net/wifi/SoftApCapability;->setSupportedChannelList(I[I)Z,blocked
 Landroid/net/wifi/SoftApCapability;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$$ExternalSyntheticLambda0;-><init>()V,blocked
+Landroid/net/wifi/SoftApConfiguration$$ExternalSyntheticLambda0;->applyAsInt(Ljava/lang/Object;)I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$1;-><init>()V,blocked
 Landroid/net/wifi/SoftApConfiguration$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/SoftApConfiguration;,blocked
 Landroid/net/wifi/SoftApConfiguration$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$1;->newArray(I)[Landroid/net/wifi/SoftApConfiguration;,blocked
 Landroid/net/wifi/SoftApConfiguration$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder$$ExternalSyntheticLambda0;-><init>()V,blocked
+Landroid/net/wifi/SoftApConfiguration$Builder$$ExternalSyntheticLambda0;->get()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;-><init>()V,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;-><init>(Landroid/net/wifi/SoftApConfiguration;)V,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->build()Landroid/net/wifi/SoftApConfiguration;,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder;->mAllowedAcsChannels2g:Ljava/util/Set;,blocked
+Landroid/net/wifi/SoftApConfiguration$Builder;->mAllowedAcsChannels5g:Ljava/util/Set;,blocked
+Landroid/net/wifi/SoftApConfiguration$Builder;->mAllowedAcsChannels6g:Ljava/util/Set;,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mAllowedClientList:Ljava/util/List;,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mAutoShutdownEnabled:Z,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mBlockedClientList:Ljava/util/List;,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mBridgedModeOpportunisticShutdownEnabled:Z,blocked
+Landroid/net/wifi/SoftApConfiguration$Builder;->mBridgedModeOpportunisticShutdownTimeoutMillis:J,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mBssid:Landroid/net/MacAddress;,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mChannels:Landroid/util/SparseIntArray;,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mClientControlByUser:Z,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mHiddenSsid:Z,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mIeee80211axEnabled:Z,blocked
+Landroid/net/wifi/SoftApConfiguration$Builder;->mIeee80211beEnabled:Z,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mIsUserConfiguration:Z,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mMacRandomizationSetting:I,blocked
+Landroid/net/wifi/SoftApConfiguration$Builder;->mMaxChannelBandwidth:I,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mMaxNumberOfClients:I,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mPassphrase:Ljava/lang/String;,blocked
+Landroid/net/wifi/SoftApConfiguration$Builder;->mPersistentRandomizedMacAddress:Landroid/net/MacAddress;,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mSecurityType:I,blocked
 Landroid/net/wifi/SoftApConfiguration$Builder;->mShutdownTimeoutMillis:J,blocked
-Landroid/net/wifi/SoftApConfiguration$Builder;->mSsid:Ljava/lang/String;,blocked
+Landroid/net/wifi/SoftApConfiguration$Builder;->mVendorElements:Ljava/util/List;,blocked
+Landroid/net/wifi/SoftApConfiguration$Builder;->mWifiSsid:Landroid/net/wifi/WifiSsid;,blocked
+Landroid/net/wifi/SoftApConfiguration$Builder;->setAllowedAcsChannels(I[I)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setAllowedClientList(Ljava/util/List;)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setAutoShutdownEnabled(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setBand(I)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setBands([I)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setBlockedClientList(Ljava/util/List;)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setBridgedModeOpportunisticShutdownEnabled(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder;->setBridgedModeOpportunisticShutdownTimeoutMillis(J)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setBssid(Landroid/net/MacAddress;)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setChannel(II)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setChannels(Landroid/util/SparseIntArray;)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setClientControlByUserEnabled(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setHiddenSsid(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setIeee80211axEnabled(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder;->setIeee80211beEnabled(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setMacRandomizationSetting(I)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder;->setMaxChannelBandwidth(I)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setMaxNumberOfClients(I)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api
 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;->setRandomizedMacAddress(Landroid/net/MacAddress;)Landroid/net/wifi/SoftApConfiguration$Builder;,blocked
 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;->setUserConfiguration(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,blocked
+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;->-$$Nest$fgetmAllowedAcsChannels2g(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/Set;,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmAllowedAcsChannels5g(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/Set;,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmAllowedAcsChannels6g(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/Set;,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmAllowedClientList(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/List;,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmAutoShutdownEnabled(Landroid/net/wifi/SoftApConfiguration;)Z,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmBlockedClientList(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/List;,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmBridgedModeOpportunisticShutdownEnabled(Landroid/net/wifi/SoftApConfiguration;)Z,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmBridgedModeOpportunisticShutdownTimeoutMillis(Landroid/net/wifi/SoftApConfiguration;)J,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmBssid(Landroid/net/wifi/SoftApConfiguration;)Landroid/net/MacAddress;,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmChannels(Landroid/net/wifi/SoftApConfiguration;)Landroid/util/SparseIntArray;,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmClientControlByUser(Landroid/net/wifi/SoftApConfiguration;)Z,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmHiddenSsid(Landroid/net/wifi/SoftApConfiguration;)Z,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmIeee80211axEnabled(Landroid/net/wifi/SoftApConfiguration;)Z,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmIeee80211beEnabled(Landroid/net/wifi/SoftApConfiguration;)Z,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmIsUserConfiguration(Landroid/net/wifi/SoftApConfiguration;)Z,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmMacRandomizationSetting(Landroid/net/wifi/SoftApConfiguration;)I,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmMaxChannelBandwidth(Landroid/net/wifi/SoftApConfiguration;)I,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmMaxNumberOfClients(Landroid/net/wifi/SoftApConfiguration;)I,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmPassphrase(Landroid/net/wifi/SoftApConfiguration;)Ljava/lang/String;,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmPersistentRandomizedMacAddress(Landroid/net/wifi/SoftApConfiguration;)Landroid/net/MacAddress;,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmSecurityType(Landroid/net/wifi/SoftApConfiguration;)I,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmShutdownTimeoutMillis(Landroid/net/wifi/SoftApConfiguration;)J,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmVendorElements(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/List;,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmWifiSsid(Landroid/net/wifi/SoftApConfiguration;)Landroid/net/wifi/WifiSsid;,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$smisBandValid(I)Z,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$smisChannelBandPairValid(II)Z,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$smreadHashSetInt(Landroid/os/Parcel;)Ljava/util/Set;,blocked
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$smreadSparseIntArray(Landroid/os/Parcel;)Landroid/util/SparseIntArray;,blocked
 Landroid/net/wifi/SoftApConfiguration;-><clinit>()V,blocked
-Landroid/net/wifi/SoftApConfiguration;-><init>(Ljava/lang/String;Landroid/net/MacAddress;Ljava/lang/String;ZLandroid/util/SparseIntArray;IIZJZLjava/util/List;Ljava/util/List;IZZZ)V,blocked
-Landroid/net/wifi/SoftApConfiguration;-><init>(Ljava/lang/String;Landroid/net/MacAddress;Ljava/lang/String;ZLandroid/util/SparseIntArray;IIZJZLjava/util/List;Ljava/util/List;IZZZLandroid/net/wifi/SoftApConfiguration$1;)V,blocked
+Landroid/net/wifi/SoftApConfiguration;-><init>(Landroid/net/wifi/WifiSsid;Landroid/net/MacAddress;Ljava/lang/String;ZLandroid/util/SparseIntArray;IIZJZLjava/util/List;Ljava/util/List;IZZZZJLjava/util/List;Landroid/net/MacAddress;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;I)V,blocked
+Landroid/net/wifi/SoftApConfiguration;-><init>(Landroid/net/wifi/WifiSsid;Landroid/net/MacAddress;Ljava/lang/String;ZLandroid/util/SparseIntArray;IIZJZLjava/util/List;Ljava/util/List;IZZZZJLjava/util/List;Landroid/net/MacAddress;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ILandroid/net/wifi/SoftApConfiguration-IA;)V,blocked
 Landroid/net/wifi/SoftApConfiguration;->BAND_2GHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->BAND_5GHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->BAND_60GHZ:I,sdk,system-api,test-api
@@ -1679,6 +2129,8 @@
 Landroid/net/wifi/SoftApConfiguration;->BAND_ANY:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->BAND_TYPES:[I,blocked
 Landroid/net/wifi/SoftApConfiguration;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->DEFAULT_TIMEOUT:J,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->FORCE_MUTUAL_EXCLUSIVE_BSSID_MAC_RAMDONIZATION_SETTING:J,blocked
 Landroid/net/wifi/SoftApConfiguration;->MAX_CH_2G_BAND:I,blocked
 Landroid/net/wifi/SoftApConfiguration;->MAX_CH_5G_BAND:I,blocked
 Landroid/net/wifi/SoftApConfiguration;->MAX_CH_60G_BAND:I,blocked
@@ -1687,50 +2139,41 @@
 Landroid/net/wifi/SoftApConfiguration;->MIN_CH_5G_BAND:I,blocked
 Landroid/net/wifi/SoftApConfiguration;->MIN_CH_60G_BAND:I,blocked
 Landroid/net/wifi/SoftApConfiguration;->MIN_CH_6G_BAND:I,blocked
-Landroid/net/wifi/SoftApConfiguration;->PSK_MAX_LEN:I,blocked
-Landroid/net/wifi/SoftApConfiguration;->PSK_MIN_LEN:I,blocked
 Landroid/net/wifi/SoftApConfiguration;->RANDOMIZATION_NONE:I,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->RANDOMIZATION_NON_PERSISTENT:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->RANDOMIZATION_PERSISTENT:I,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->REMOVE_ZERO_FOR_TIMEOUT_SETTING:J,blocked
 Landroid/net/wifi/SoftApConfiguration;->SECURITY_TYPE_OPEN:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->SECURITY_TYPE_WPA2_PSK:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->SECURITY_TYPE_WPA3_OWE:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->SECURITY_TYPE_WPA3_OWE_TRANSITION:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->SECURITY_TYPE_WPA3_SAE:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->SECURITY_TYPE_WPA3_SAE_TRANSITION:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->TAG:Ljava/lang/String;,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$000(Landroid/os/Parcel;)Landroid/util/SparseIntArray;,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$1000(Landroid/net/wifi/SoftApConfiguration;)J,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$1100(Landroid/net/wifi/SoftApConfiguration;)Z,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$1200(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/List;,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$1300(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/List;,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$1400(Landroid/net/wifi/SoftApConfiguration;)I,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$1500(Landroid/net/wifi/SoftApConfiguration;)Z,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$1600(Landroid/net/wifi/SoftApConfiguration;)Z,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$1700(Landroid/net/wifi/SoftApConfiguration;)Z,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$1800(I)Z,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$1900(II)Z,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$200(Landroid/net/wifi/SoftApConfiguration;)Ljava/lang/String;,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$300(Landroid/net/wifi/SoftApConfiguration;)Landroid/net/MacAddress;,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$400(Landroid/net/wifi/SoftApConfiguration;)Ljava/lang/String;,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$500(Landroid/net/wifi/SoftApConfiguration;)Z,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$600(Landroid/net/wifi/SoftApConfiguration;)Landroid/util/SparseIntArray;,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$700(Landroid/net/wifi/SoftApConfiguration;)I,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$800(Landroid/net/wifi/SoftApConfiguration;)I,blocked
-Landroid/net/wifi/SoftApConfiguration;->access$900(Landroid/net/wifi/SoftApConfiguration;)Z,blocked
 Landroid/net/wifi/SoftApConfiguration;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getAllowedAcsChannels(I)[I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getAllowedClientList()Ljava/util/List;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getBand()I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getBands()[I,blocked
 Landroid/net/wifi/SoftApConfiguration;->getBlockedClientList()Ljava/util/List;,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getBridgedModeOpportunisticShutdownTimeoutMillis()J,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getBridgedModeOpportunisticShutdownTimeoutMillisInternal()J,blocked
 Landroid/net/wifi/SoftApConfiguration;->getBssid()Landroid/net/MacAddress;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getChannel()I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getChannels()Landroid/util/SparseIntArray;,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getMacRandomizationSetting()I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getMacRandomizationSettingInternal()I,blocked
+Landroid/net/wifi/SoftApConfiguration;->getMaxChannelBandwidth()I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getMaxNumberOfClients()I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getPassphrase()Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getPersistentRandomizedMacAddress()Landroid/net/MacAddress;,sdk,system-api,test-api
 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;->getVendorElements()Ljava/util/List;,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getVendorElementsInternal()Ljava/util/List;,blocked
+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
 Landroid/net/wifi/SoftApConfiguration;->isAutoShutdownEnabled()Z,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->isBandValid(I)Z,blocked
@@ -1741,27 +2184,39 @@
 Landroid/net/wifi/SoftApConfiguration;->isHiddenSsid()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->isIeee80211axEnabled()Z,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->isIeee80211axEnabledInternal()Z,blocked
+Landroid/net/wifi/SoftApConfiguration;->isIeee80211beEnabled()Z,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->isIeee80211beEnabledInternal()Z,blocked
 Landroid/net/wifi/SoftApConfiguration;->isUserConfiguration()Z,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->isUserConfigurationInternal()Z,blocked
+Landroid/net/wifi/SoftApConfiguration;->mAllowedAcsChannels2g:Ljava/util/Set;,blocked
+Landroid/net/wifi/SoftApConfiguration;->mAllowedAcsChannels5g:Ljava/util/Set;,blocked
+Landroid/net/wifi/SoftApConfiguration;->mAllowedAcsChannels6g:Ljava/util/Set;,blocked
 Landroid/net/wifi/SoftApConfiguration;->mAllowedClientList:Ljava/util/List;,blocked
 Landroid/net/wifi/SoftApConfiguration;->mAutoShutdownEnabled:Z,blocked
 Landroid/net/wifi/SoftApConfiguration;->mBlockedClientList:Ljava/util/List;,blocked
 Landroid/net/wifi/SoftApConfiguration;->mBridgedModeOpportunisticShutdownEnabled:Z,blocked
+Landroid/net/wifi/SoftApConfiguration;->mBridgedModeOpportunisticShutdownTimeoutMillis:J,blocked
 Landroid/net/wifi/SoftApConfiguration;->mBssid:Landroid/net/MacAddress;,blocked
 Landroid/net/wifi/SoftApConfiguration;->mChannels:Landroid/util/SparseIntArray;,blocked
 Landroid/net/wifi/SoftApConfiguration;->mClientControlByUser:Z,blocked
 Landroid/net/wifi/SoftApConfiguration;->mHiddenSsid:Z,blocked
 Landroid/net/wifi/SoftApConfiguration;->mIeee80211axEnabled:Z,blocked
+Landroid/net/wifi/SoftApConfiguration;->mIeee80211beEnabled:Z,blocked
 Landroid/net/wifi/SoftApConfiguration;->mIsUserConfiguration:Z,blocked
 Landroid/net/wifi/SoftApConfiguration;->mMacRandomizationSetting:I,blocked
+Landroid/net/wifi/SoftApConfiguration;->mMaxChannelBandwidth:I,blocked
 Landroid/net/wifi/SoftApConfiguration;->mMaxNumberOfClients:I,blocked
 Landroid/net/wifi/SoftApConfiguration;->mPassphrase:Ljava/lang/String;,blocked
+Landroid/net/wifi/SoftApConfiguration;->mPersistentRandomizedMacAddress:Landroid/net/MacAddress;,blocked
 Landroid/net/wifi/SoftApConfiguration;->mSecurityType:I,blocked
 Landroid/net/wifi/SoftApConfiguration;->mShutdownTimeoutMillis:J,blocked
-Landroid/net/wifi/SoftApConfiguration;->mSsid:Ljava/lang/String;,blocked
+Landroid/net/wifi/SoftApConfiguration;->mVendorElements:Ljava/util/List;,blocked
+Landroid/net/wifi/SoftApConfiguration;->mWifiSsid:Landroid/net/wifi/WifiSsid;,blocked
+Landroid/net/wifi/SoftApConfiguration;->readHashSetInt(Landroid/os/Parcel;)Ljava/util/Set;,blocked
 Landroid/net/wifi/SoftApConfiguration;->readSparseIntArray(Landroid/os/Parcel;)Landroid/util/SparseIntArray;,blocked
 Landroid/net/wifi/SoftApConfiguration;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->toWifiConfiguration()Landroid/net/wifi/WifiConfiguration;,sdk,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->writeHashSetInt(Landroid/os/Parcel;Ljava/util/Set;)V,blocked
 Landroid/net/wifi/SoftApConfiguration;->writeSparseIntArray(Landroid/os/Parcel;Landroid/util/SparseIntArray;)V,blocked
 Landroid/net/wifi/SoftApConfiguration;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo$1;-><init>()V,blocked
@@ -1769,6 +2224,12 @@
 Landroid/net/wifi/SoftApInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo$1;->newArray(I)[Landroid/net/wifi/SoftApInfo;,blocked
 Landroid/net/wifi/SoftApInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/SoftApInfo;->-$$Nest$fputmApInstanceIdentifier(Landroid/net/wifi/SoftApInfo;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/SoftApInfo;->-$$Nest$fputmBandwidth(Landroid/net/wifi/SoftApInfo;I)V,blocked
+Landroid/net/wifi/SoftApInfo;->-$$Nest$fputmBssid(Landroid/net/wifi/SoftApInfo;Landroid/net/MacAddress;)V,blocked
+Landroid/net/wifi/SoftApInfo;->-$$Nest$fputmFrequency(Landroid/net/wifi/SoftApInfo;I)V,blocked
+Landroid/net/wifi/SoftApInfo;->-$$Nest$fputmIdleShutdownTimeoutMillis(Landroid/net/wifi/SoftApInfo;J)V,blocked
+Landroid/net/wifi/SoftApInfo;->-$$Nest$fputmWifiStandard(Landroid/net/wifi/SoftApInfo;I)V,blocked
 Landroid/net/wifi/SoftApInfo;-><clinit>()V,blocked
 Landroid/net/wifi/SoftApInfo;-><init>()V,blocked
 Landroid/net/wifi/SoftApInfo;-><init>(Landroid/net/wifi/SoftApInfo;)V,blocked
@@ -1776,20 +2237,16 @@
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_20MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_20MHZ_NOHT:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_2160MHZ:I,sdk,system-api,test-api
+Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_320MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_40MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_4320MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_6480MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_80MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_80MHZ_PLUS_MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_8640MHZ:I,sdk,system-api,test-api
+Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_AUTO:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_INVALID:I,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
-Landroid/net/wifi/SoftApInfo;->access$002(Landroid/net/wifi/SoftApInfo;I)I,blocked
-Landroid/net/wifi/SoftApInfo;->access$102(Landroid/net/wifi/SoftApInfo;I)I,blocked
-Landroid/net/wifi/SoftApInfo;->access$202(Landroid/net/wifi/SoftApInfo;Landroid/net/MacAddress;)Landroid/net/MacAddress;,blocked
-Landroid/net/wifi/SoftApInfo;->access$302(Landroid/net/wifi/SoftApInfo;I)I,blocked
-Landroid/net/wifi/SoftApInfo;->access$402(Landroid/net/wifi/SoftApInfo;Ljava/lang/String;)Ljava/lang/String;,blocked
-Landroid/net/wifi/SoftApInfo;->access$502(Landroid/net/wifi/SoftApInfo;J)J,blocked
 Landroid/net/wifi/SoftApInfo;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->getApInstanceIdentifier()Ljava/lang/String;,blocked
@@ -1858,10 +2315,11 @@
 Landroid/net/wifi/WifiAvailableChannel;-><clinit>()V,blocked
 Landroid/net/wifi/WifiAvailableChannel;-><init>(II)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiAvailableChannel;-><init>(Landroid/os/Parcel;)V,blocked
-Landroid/net/wifi/WifiAvailableChannel;-><init>(Landroid/os/Parcel;Landroid/net/wifi/WifiAvailableChannel$1;)V,blocked
+Landroid/net/wifi/WifiAvailableChannel;-><init>(Landroid/os/Parcel;Landroid/net/wifi/WifiAvailableChannel-IA;)V,blocked
 Landroid/net/wifi/WifiAvailableChannel;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
 Landroid/net/wifi/WifiAvailableChannel;->FILTER_CELLULAR_COEXISTENCE:I,blocked
 Landroid/net/wifi/WifiAvailableChannel;->FILTER_CONCURRENCY:I,blocked
+Landroid/net/wifi/WifiAvailableChannel;->FILTER_NAN_INSTANT_MODE:I,blocked
 Landroid/net/wifi/WifiAvailableChannel;->FILTER_REGULATORY:I,blocked
 Landroid/net/wifi/WifiAvailableChannel;->OP_MODE_SAP:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiAvailableChannel;->OP_MODE_STA:I,sdk,system-api,test-api
@@ -1888,7 +2346,7 @@
 Landroid/net/wifi/WifiClient;-><clinit>()V,blocked
 Landroid/net/wifi/WifiClient;-><init>(Landroid/net/MacAddress;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/WifiClient;-><init>(Landroid/os/Parcel;)V,blocked
-Landroid/net/wifi/WifiClient;-><init>(Landroid/os/Parcel;Landroid/net/wifi/WifiClient$1;)V,blocked
+Landroid/net/wifi/WifiClient;-><init>(Landroid/os/Parcel;Landroid/net/wifi/WifiClient-IA;)V,blocked
 Landroid/net/wifi/WifiClient;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
 Landroid/net/wifi/WifiClient;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiClient;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
@@ -1899,99 +2357,75 @@
 Landroid/net/wifi/WifiClient;->mMacAddress:Landroid/net/MacAddress;,blocked
 Landroid/net/wifi/WifiClient;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiClient;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;-><init>(Landroid/os/Parcel;I)V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;->f$0:Landroid/os/Parcel;,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;->f$1:I,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;-><init>(I)V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;->f$0:I,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;-><init>()V,blocked
+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;-><init>(Z)V,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;->f$0:Z,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda11;-><init>(I)V,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda11;->f$0:I,blocked
 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;-><init>(I)V,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda12;->f$0:I,blocked
 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;-><init>(I)V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->f$0:I,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;-><init>(Z)V,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->f$0:Z,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;-><init>(I)V,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;->f$0:I,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda15;-><init>(Landroid/net/wifi/SecurityParams;)V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda15;->f$0:Landroid/net/wifi/SecurityParams;,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda15;-><init>()V,blocked
 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;-><clinit>()V,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda16;-><init>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda16;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda16;,blocked
 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;-><clinit>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;-><init>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;,blocked
-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;-><clinit>()V,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;-><init>(ZZ)V,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->f$0:Z,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->f$1:Z,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;-><init>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;,blocked
 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;-><clinit>()V,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;-><init>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;,blocked
-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;-><init>(Ljava/lang/StringBuilder;)V,blocked
+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$$ExternalSyntheticLambda1;-><init>(Landroid/os/Parcel;I)V,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda1;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda1;->f$0:Ljava/lang/StringBuilder;,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;-><clinit>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;-><init>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;-><clinit>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;-><init>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda1;->f$0:Landroid/os/Parcel;,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda1;->f$1:I,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;-><init>(Ljava/lang/StringBuilder;)V,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;->f$0:Ljava/lang/StringBuilder;,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;-><init>(Landroid/net/wifi/SecurityParams;)V,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;->f$0:Landroid/net/wifi/SecurityParams;,blocked
 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;-><clinit>()V,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda22;-><init>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda22;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda22;,blocked
 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;-><clinit>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;-><init>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda24;-><clinit>()V,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;-><init>(Z)V,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;->f$0:Z,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda24;-><init>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda24;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda24;,blocked
 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;-><clinit>()V,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;-><init>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;-><init>(Z)V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;->f$0:Z,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda3;-><init>(Z)V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda3;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda3;->f$0:Z,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;-><init>(Z)V,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;-><init>(I)V,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;->f$0:I,blocked
+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;-><init>()V,blocked
+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;-><init>(ZZ)V,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->f$0:Z,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;-><init>(Z)V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->f$0:Z,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;-><init>(ZZ)V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;->f$0:Z,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;->f$1:Z,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;-><init>(ZZ)V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;->f$0:Z,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;->f$1:Z,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;-><clinit>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;-><init>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;-><clinit>()V,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->f$1:Z,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;-><init>()V,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;-><init>()V,blocked
+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;-><init>(I)V,blocked
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;->f$0:I,blocked
+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;-><init>(Z)V,blocked
+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;->f$0:Z,blocked
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;-><init>()V,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;,blocked
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;->apply(Ljava/lang/Object;)Ljava/lang/Object;,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;-><init>()V,blocked
 Landroid/net/wifi/WifiConfiguration$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/WifiConfiguration;,blocked
 Landroid/net/wifi/WifiConfiguration$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -2026,6 +2460,7 @@
 Landroid/net/wifi/WifiConfiguration$GroupMgmtCipher;->varName:Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiConfiguration$KeyMgmt;-><clinit>()V,blocked
 Landroid/net/wifi/WifiConfiguration$KeyMgmt;-><init>()V,lo-prio,max-target-o
+Landroid/net/wifi/WifiConfiguration$KeyMgmt;->DPP:I,blocked
 Landroid/net/wifi/WifiConfiguration$KeyMgmt;->FILS_SHA256:I,blocked
 Landroid/net/wifi/WifiConfiguration$KeyMgmt;->FILS_SHA384:I,blocked
 Landroid/net/wifi/WifiConfiguration$KeyMgmt;->FT_EAP:I,lo-prio,max-target-o
@@ -2090,9 +2525,11 @@
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getCandidateSecurityParams()Landroid/net/wifi/SecurityParams;,blocked
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getConnectChoice()Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getConnectChoiceRssi()I,blocked
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getDisableEndTime()J,blocked
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getDisableReasonByString(Ljava/lang/String;)I,blocked
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getDisableReasonCounter(I)I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getDisableTime()J,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getLastUsedSecurityParams()Landroid/net/wifi/SecurityParams;,blocked
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getMaxNetworkSelectionDisableReason()I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getNetworkSelectionBSSID()Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getNetworkSelectionDisableReason()I,sdk,system-api,test-api
@@ -2114,11 +2551,13 @@
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mConnectChoiceRssi:I,blocked
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mHasEverConnected:Z,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mHasNeverDetectedCaptivePortal:Z,blocked
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mLastUsedSecurityParams:Landroid/net/wifi/SecurityParams;,blocked
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mNetworkSeclectionDisableCounter:[I,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mNetworkSelectionBSSID:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mNetworkSelectionDisableReason:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mSeenInLastQualifiedNetworkSelection:Z,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mStatus:I,lo-prio,max-target-o
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mTemporarilyDisabledEndTime:J,blocked
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mTemporarilyDisabledTimestamp:J,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->readFromParcel(Landroid/os/Parcel;)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setCandidate(Landroid/net/wifi/ScanResult;)V,lo-prio,max-target-o
@@ -2126,15 +2565,17 @@
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setCandidateSecurityParams(Landroid/net/wifi/SecurityParams;)V,blocked
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setConnectChoice(Ljava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setConnectChoiceRssi(I)V,blocked
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setDisableEndTime(J)V,blocked
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setDisableReasonCounter(II)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setDisableTime(J)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setHasEverConnected(Z)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setHasNeverDetectedCaptivePortal(Z)V,blocked
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setLastUsedSecurityParams(Landroid/net/wifi/SecurityParams;)V,blocked
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setNetworkSelectionBSSID(Ljava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setNetworkSelectionDisableReason(I)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setNetworkSelectionStatus(I)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setSeenInLastQualifiedNetworkSelection(Z)V,lo-prio,max-target-o
-Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->writeToParcel(Landroid/os/Parcel;)V,lo-prio,max-target-o
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->writeToParcel(Landroid/os/Parcel;I)V,blocked
 Landroid/net/wifi/WifiConfiguration$PairwiseCipher;-><clinit>()V,blocked
 Landroid/net/wifi/WifiConfiguration$PairwiseCipher;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$PairwiseCipher;->CCMP:I,public-api,sdk,system-api,test-api
@@ -2154,7 +2595,7 @@
 Landroid/net/wifi/WifiConfiguration$Protocol;->strings:[Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$Protocol;->varName:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$RecentFailure;-><init>()V,lo-prio,max-target-o
-Landroid/net/wifi/WifiConfiguration$RecentFailure;-><init>(Landroid/net/wifi/WifiConfiguration$1;)V,blocked
+Landroid/net/wifi/WifiConfiguration$RecentFailure;-><init>(Landroid/net/wifi/WifiConfiguration$RecentFailure-IA;)V,blocked
 Landroid/net/wifi/WifiConfiguration$RecentFailure;->clear()V,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$RecentFailure;->getAssociationStatus()I,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration$RecentFailure;->getLastUpdateTimeSinceBootMillis()J,blocked
@@ -2173,6 +2614,21 @@
 Landroid/net/wifi/WifiConfiguration$SuiteBCipher;->ECDHE_RSA:I,blocked
 Landroid/net/wifi/WifiConfiguration$SuiteBCipher;->strings:[Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiConfiguration$SuiteBCipher;->varName:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fgetmNetworkSelectionStatus(Landroid/net/wifi/WifiConfiguration;)Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fgetmSecurityParamsList(Landroid/net/wifi/WifiConfiguration;)Ljava/util/List;,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmBssidAllowlist(Landroid/net/wifi/WifiConfiguration;Ljava/util/List;)V,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmDeletionPriority(Landroid/net/wifi/WifiConfiguration;I)V,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmDppCSignKey(Landroid/net/wifi/WifiConfiguration;[B)V,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmDppConnector(Landroid/net/wifi/WifiConfiguration;[B)V,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmDppNetAccessKey(Landroid/net/wifi/WifiConfiguration;[B)V,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmDppPrivateEcKey(Landroid/net/wifi/WifiConfiguration;[B)V,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmIsDppConfigurator(Landroid/net/wifi/WifiConfiguration;Z)V,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmIsRepeaterEnabled(Landroid/net/wifi/WifiConfiguration;Z)V,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmPasspointManagementObjectTree(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmPasspointUniqueId(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmRandomizedMacAddress(Landroid/net/wifi/WifiConfiguration;Landroid/net/MacAddress;)V,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmSubscriptionGroup(Landroid/net/wifi/WifiConfiguration;Landroid/os/ParcelUuid;)V,blocked
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$smreadBitSet(Landroid/os/Parcel;)Ljava/util/BitSet;,blocked
 Landroid/net/wifi/WifiConfiguration;-><clinit>()V,blocked
 Landroid/net/wifi/WifiConfiguration;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;-><init>(Landroid/net/wifi/WifiConfiguration;)V,public-api,sdk,system-api,test-api
@@ -2192,10 +2648,10 @@
 Landroid/net/wifi/WifiConfiguration;->METERED_OVERRIDE_METERED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->METERED_OVERRIDE_NONE:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->METERED_OVERRIDE_NOT_METERED:I,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_AUTO:I,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_NONE:I,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_NON_PERSISTENT:I,sdk,system-api,test-api
-Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_PERSISTENT:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_AUTO:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_NONE:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_NON_PERSISTENT:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_PERSISTENT:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->RECENT_FAILURE_DISCONNECTION_AP_BUSY:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->RECENT_FAILURE_MBO_ASSOC_DISALLOWED_AIR_INTERFACE_OVERLOADED:I,sdk,system-api,test-api
@@ -2208,6 +2664,7 @@
 Landroid/net/wifi/WifiConfiguration;->RECENT_FAILURE_OCE_RSSI_BASED_ASSOCIATION_REJECTION:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->RECENT_FAILURE_POOR_CHANNEL_CONDITIONS:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->RECENT_FAILURE_REFUSED_TEMPORARILY:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->SECURITY_TYPE_DPP:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->SECURITY_TYPE_EAP:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->SECURITY_TYPE_EAP_SUITE_B:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->SECURITY_TYPE_EAP_WPA3_ENTERPRISE:I,public-api,sdk,system-api,test-api
@@ -2227,13 +2684,6 @@
 Landroid/net/wifi/WifiConfiguration;->SSID:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->TAG:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration;->UNKNOWN_UID:I,lo-prio,max-target-o
-Landroid/net/wifi/WifiConfiguration;->access$100(Landroid/net/wifi/WifiConfiguration;)Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;,blocked
-Landroid/net/wifi/WifiConfiguration;->access$202(Landroid/net/wifi/WifiConfiguration;I)I,blocked
-Landroid/net/wifi/WifiConfiguration;->access$300(Landroid/os/Parcel;)Ljava/util/BitSet;,blocked
-Landroid/net/wifi/WifiConfiguration;->access$400(Landroid/net/wifi/WifiConfiguration;)Ljava/util/List;,blocked
-Landroid/net/wifi/WifiConfiguration;->access$502(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Ljava/lang/String;,blocked
-Landroid/net/wifi/WifiConfiguration;->access$602(Landroid/net/wifi/WifiConfiguration;Landroid/net/MacAddress;)Landroid/net/MacAddress;,blocked
-Landroid/net/wifi/WifiConfiguration;->access$702(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiConfiguration;->addSecurityParams(I)V,blocked
 Landroid/net/wifi/WifiConfiguration;->addSecurityParams(Landroid/net/wifi/SecurityParams;)V,blocked
 Landroid/net/wifi/WifiConfiguration;->allowAutojoin:Z,sdk,system-api,test-api
@@ -2252,6 +2702,7 @@
 Landroid/net/wifi/WifiConfiguration;->convertLegacyFieldsToSecurityParamsIfNeeded()V,blocked
 Landroid/net/wifi/WifiConfiguration;->creatorName:Ljava/lang/String;,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->creatorUid:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->dbsSecondaryInternet:Z,blocked
 Landroid/net/wifi/WifiConfiguration;->defaultGwMacAddress:Ljava/lang/String;,unsupported
 Landroid/net/wifi/WifiConfiguration;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->dhcpServer:Ljava/lang/String;,lo-prio,max-target-o
@@ -2264,17 +2715,26 @@
 Landroid/net/wifi/WifiConfiguration;->ephemeral:Z,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration;->fromWifiNetworkSpecifier:Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->fromWifiNetworkSuggestion:Z,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getAllNetworkKeys()Ljava/util/Set;,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getAuthType()I,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getBssidAllowlist()Ljava/util/List;,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getBssidAllowlistInternal()Ljava/util/List;,blocked
 Landroid/net/wifi/WifiConfiguration;->getDefaultSecurityParams()Landroid/net/wifi/SecurityParams;,blocked
 Landroid/net/wifi/WifiConfiguration;->getDefaultSecurityType()Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiConfiguration;->getDeletionPriority()I,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getDppCSignKey()[B,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getDppConnector()[B,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getDppNetAccessKey()[B,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getDppPrivateEcKey()[B,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getHttpProxy()Landroid/net/ProxyInfo;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment;,unsupported
 Landroid/net/wifi/WifiConfiguration;->getIpConfiguration()Landroid/net/IpConfiguration;,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getKey()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getKeyIdForCredentials(Landroid/net/wifi/WifiConfiguration;)Ljava/lang/String;,lo-prio,max-target-o
+Landroid/net/wifi/WifiConfiguration;->getMacRandomizationSetting()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getMoTree()Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration;->getNetworkKey()Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiConfiguration;->getNetworkKeyFromSecurityType(I)Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiConfiguration;->getNetworkSelectionStatus()Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getPasspointUniqueId()Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiConfiguration;->getPrintableSsid()Ljava/lang/String;,sdk,system-api,test-api
@@ -2287,10 +2747,13 @@
 Landroid/net/wifi/WifiConfiguration;->getSecurityTypeName(I)Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiConfiguration;->getSsidAndSecurityTypeString()Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration;,unsupported
+Landroid/net/wifi/WifiConfiguration;->getSubscriptionGroup()Landroid/os/ParcelUuid;,blocked
 Landroid/net/wifi/WifiConfiguration;->hasNoInternetAccess()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->hasWepKeys()Z,blocked
 Landroid/net/wifi/WifiConfiguration;->hiddenSSID:Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->hiddenSSIDVarName:Ljava/lang/String;,lo-prio,max-target-o
+Landroid/net/wifi/WifiConfiguration;->isCurrentlyConnected:Z,blocked
+Landroid/net/wifi/WifiConfiguration;->isDppConfigurator()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->isEnterprise()Z,unsupported
 Landroid/net/wifi/WifiConfiguration;->isEphemeral()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->isFilsSha256Enabled()Z,blocked
@@ -2303,10 +2766,12 @@
 Landroid/net/wifi/WifiConfiguration;->isNoInternetAccessExpected()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->isOpenNetwork()Z,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration;->isPasspoint()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->isRepeaterEnabled()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->isSecurityType(I)Z,blocked
 Landroid/net/wifi/WifiConfiguration;->isSuiteBCipherEcdheEcdsaEnabled()Z,blocked
 Landroid/net/wifi/WifiConfiguration;->isSuiteBCipherEcdheRsaEnabled()Z,blocked
 Landroid/net/wifi/WifiConfiguration;->isValidMacAddressForRandomization(Landroid/net/MacAddress;)Z,lo-prio,max-target-o
+Landroid/net/wifi/WifiConfiguration;->isWpa3EnterpriseConfiguration()Z,blocked
 Landroid/net/wifi/WifiConfiguration;->lambda$addSecurityParams$1(ILandroid/net/wifi/SecurityParams;)Z,blocked
 Landroid/net/wifi/WifiConfiguration;->lambda$addSecurityParams$2(Landroid/net/wifi/SecurityParams;Landroid/net/wifi/SecurityParams;)Z,blocked
 Landroid/net/wifi/WifiConfiguration;->lambda$enableFils$9(ZZLandroid/net/wifi/SecurityParams;)V,blocked
@@ -2341,13 +2806,21 @@
 Landroid/net/wifi/WifiConfiguration;->lastUpdated:J,blocked
 Landroid/net/wifi/WifiConfiguration;->linkedConfigurations:Ljava/util/HashMap;,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration;->logTimeOfDay(J)Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiConfiguration;->mBssidAllowlist:Ljava/util/List;,blocked
 Landroid/net/wifi/WifiConfiguration;->mDeletionPriority:I,blocked
+Landroid/net/wifi/WifiConfiguration;->mDppCSignKey:[B,blocked
+Landroid/net/wifi/WifiConfiguration;->mDppConnector:[B,blocked
+Landroid/net/wifi/WifiConfiguration;->mDppNetAccessKey:[B,blocked
+Landroid/net/wifi/WifiConfiguration;->mDppPrivateEcKey:[B,blocked
 Landroid/net/wifi/WifiConfiguration;->mIpConfiguration:Landroid/net/IpConfiguration;,unsupported
+Landroid/net/wifi/WifiConfiguration;->mIsDppConfigurator:Z,blocked
+Landroid/net/wifi/WifiConfiguration;->mIsRepeaterEnabled:Z,blocked
 Landroid/net/wifi/WifiConfiguration;->mNetworkSelectionStatus:Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration;->mPasspointManagementObjectTree:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration;->mPasspointUniqueId:Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiConfiguration;->mRandomizedMacAddress:Landroid/net/MacAddress;,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration;->mSecurityParamsList:Ljava/util/List;,blocked
+Landroid/net/wifi/WifiConfiguration;->mSubscriptionGroup:Landroid/os/ParcelUuid;,blocked
 Landroid/net/wifi/WifiConfiguration;->macRandomizationSetting:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->meteredHint:Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->meteredOverride:I,sdk,system-api,test-api
@@ -2374,18 +2847,24 @@
 Landroid/net/wifi/WifiConfiguration;->readBitSet(Landroid/os/Parcel;)Ljava/util/BitSet;,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration;->recentFailure:Landroid/net/wifi/WifiConfiguration$RecentFailure;,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration;->requirePmf:Z,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->restricted:Z,blocked
 Landroid/net/wifi/WifiConfiguration;->roamingConsortiumIds:[J,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->selfAdded:Z,max-target-r
+Landroid/net/wifi/WifiConfiguration;->setBssidAllowlist(Ljava/util/List;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->setDeletionPriority(I)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->setDppConfigurator([B)V,blocked
+Landroid/net/wifi/WifiConfiguration;->setDppConnectionKeys([B[B[B)V,blocked
 Landroid/net/wifi/WifiConfiguration;->setHttpProxy(Landroid/net/ProxyInfo;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V,unsupported
-Landroid/net/wifi/WifiConfiguration;->setIpConfiguration(Landroid/net/IpConfiguration;)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->setIpConfiguration(Landroid/net/IpConfiguration;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->setMacRandomizationSetting(I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->setNetworkSelectionStatus(Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->setPasspointManagementObjectTree(Ljava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration;->setPasspointUniqueId(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V,unsupported
 Landroid/net/wifi/WifiConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V,unsupported
 Landroid/net/wifi/WifiConfiguration;->setRandomizedMacAddress(Landroid/net/MacAddress;)V,lo-prio,max-target-o
+Landroid/net/wifi/WifiConfiguration;->setRepeaterEnabled(Z)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->setSecurityParams(I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->setSecurityParams(Landroid/net/wifi/SecurityParams;)V,blocked
 Landroid/net/wifi/WifiConfiguration;->setSecurityParams(Ljava/util/BitSet;)V,blocked
@@ -2393,6 +2872,7 @@
 Landroid/net/wifi/WifiConfiguration;->setSecurityParamsEnabled(IZ)V,blocked
 Landroid/net/wifi/WifiConfiguration;->setSecurityParamsIsAddedByAutoUpgrade(IZ)V,blocked
 Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V,unsupported
+Landroid/net/wifi/WifiConfiguration;->setSubscriptionGroup(Landroid/os/ParcelUuid;)V,blocked
 Landroid/net/wifi/WifiConfiguration;->shared:Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->ssidVarName:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiConfiguration;->status:I,public-api,sdk,system-api,test-api
@@ -2423,7 +2903,7 @@
 Landroid/net/wifi/WifiConnectedSessionInfo$Builder;->setUserSelected(Z)Landroid/net/wifi/WifiConnectedSessionInfo$Builder;,sdk,system-api,test-api
 Landroid/net/wifi/WifiConnectedSessionInfo;-><clinit>()V,blocked
 Landroid/net/wifi/WifiConnectedSessionInfo;-><init>(IZ)V,blocked
-Landroid/net/wifi/WifiConnectedSessionInfo;-><init>(IZLandroid/net/wifi/WifiConnectedSessionInfo$1;)V,blocked
+Landroid/net/wifi/WifiConnectedSessionInfo;-><init>(IZLandroid/net/wifi/WifiConnectedSessionInfo-IA;)V,blocked
 Landroid/net/wifi/WifiConnectedSessionInfo;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
 Landroid/net/wifi/WifiConnectedSessionInfo;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiConnectedSessionInfo;->getSessionId()I,sdk,system-api,test-api
@@ -2431,6 +2911,32 @@
 Landroid/net/wifi/WifiConnectedSessionInfo;->mIsUserSelected:Z,blocked
 Landroid/net/wifi/WifiConnectedSessionInfo;->mSessionId:I,blocked
 Landroid/net/wifi/WifiConnectedSessionInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiContext$$ExternalSyntheticLambda0;-><init>()V,blocked
+Landroid/net/wifi/WifiContext$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiContext$$ExternalSyntheticLambda1;-><init>()V,blocked
+Landroid/net/wifi/WifiContext$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiContext;-><init>(Landroid/content/Context;)V,blocked
+Landroid/net/wifi/WifiContext;->ACTION_RESOURCES_APK:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiContext;->ACTION_WIFI_DIALOG_APK:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiContext;->SERVICE_WIFI_PACKAGE_NAME:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiContext;->TAG:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiContext;->getApkPkgNameForAction(Ljava/lang/String;)Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiContext;->getAssets()Landroid/content/res/AssetManager;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiContext;->getResources()Landroid/content/res/Resources;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiContext;->getResourcesApkContext()Landroid/content/Context;,blocked
+Landroid/net/wifi/WifiContext;->getServiceWifiPackageName()Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiContext;->getStringResourceWrapper(II)Landroid/net/wifi/WifiStringResourceWrapper;,blocked
+Landroid/net/wifi/WifiContext;->getTheme()Landroid/content/res/Resources$Theme;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiContext;->getWifiDialogApkPkgName()Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiContext;->getWifiOverlayApkPkgName()Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiContext;->lambda$getApkPkgNameForAction$0(Landroid/content/pm/ResolveInfo;)Z,blocked
+Landroid/net/wifi/WifiContext;->lambda$getApkPkgNameForAction$1(Landroid/content/pm/ResolveInfo;)Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiContext;->mWifiAssetsFromApk:Landroid/content/res/AssetManager;,blocked
+Landroid/net/wifi/WifiContext;->mWifiDialogApkPkgName:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiContext;->mWifiOverlayApkPkgName:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiContext;->mWifiResourcesFromApk:Landroid/content/res/Resources;,blocked
+Landroid/net/wifi/WifiContext;->mWifiThemeFromApk:Landroid/content/res/Resources$Theme;,blocked
+Landroid/net/wifi/WifiContext;->resetResourceCache()V,blocked
 Landroid/net/wifi/WifiEnterpriseConfig$1;-><init>()V,blocked
 Landroid/net/wifi/WifiEnterpriseConfig$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/WifiEnterpriseConfig;,blocked
 Landroid/net/wifi/WifiEnterpriseConfig$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -2464,6 +2970,18 @@
 Landroid/net/wifi/WifiEnterpriseConfig$Phase2;->strings:[Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiEnterpriseConfig$SupplicantLoader;->loadValue(Ljava/lang/String;)Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiEnterpriseConfig$SupplicantSaver;->saveValue(Ljava/lang/String;Ljava/lang/String;)Z,lo-prio,max-target-o
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fgetmFields(Landroid/net/wifi/WifiEnterpriseConfig;)Ljava/util/HashMap;,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmCaCerts(Landroid/net/wifi/WifiEnterpriseConfig;[Ljava/security/cert/X509Certificate;)V,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmClientCertificateChain(Landroid/net/wifi/WifiEnterpriseConfig;[Ljava/security/cert/X509Certificate;)V,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmClientPrivateKey(Landroid/net/wifi/WifiEnterpriseConfig;Ljava/security/PrivateKey;)V,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmEapMethod(Landroid/net/wifi/WifiEnterpriseConfig;I)V,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmIsAppInstalledCaCert(Landroid/net/wifi/WifiEnterpriseConfig;Z)V,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmIsAppInstalledDeviceKeyAndCert(Landroid/net/wifi/WifiEnterpriseConfig;Z)V,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmIsTrustOnFirstUseEnabled(Landroid/net/wifi/WifiEnterpriseConfig;Z)V,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmKeyChainAlias(Landroid/net/wifi/WifiEnterpriseConfig;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmOcsp(Landroid/net/wifi/WifiEnterpriseConfig;I)V,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmPhase2Method(Landroid/net/wifi/WifiEnterpriseConfig;I)V,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmUserApproveNoCaCert(Landroid/net/wifi/WifiEnterpriseConfig;Z)V,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;-><clinit>()V,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;-><init>(Landroid/net/wifi/WifiEnterpriseConfig;)V,public-api,sdk,system-api,test-api
@@ -2514,21 +3032,12 @@
 Landroid/net/wifi/WifiEnterpriseConfig;->WAPI_AS_CERTIFICATE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->WAPI_CERT_SUITE_KEY:Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->WAPI_USER_CERTIFICATE:Ljava/lang/String;,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiEnterpriseConfig;->access$000(Landroid/net/wifi/WifiEnterpriseConfig;)Ljava/util/HashMap;,blocked
-Landroid/net/wifi/WifiEnterpriseConfig;->access$102(Landroid/net/wifi/WifiEnterpriseConfig;I)I,blocked
-Landroid/net/wifi/WifiEnterpriseConfig;->access$202(Landroid/net/wifi/WifiEnterpriseConfig;I)I,blocked
-Landroid/net/wifi/WifiEnterpriseConfig;->access$302(Landroid/net/wifi/WifiEnterpriseConfig;[Ljava/security/cert/X509Certificate;)[Ljava/security/cert/X509Certificate;,blocked
-Landroid/net/wifi/WifiEnterpriseConfig;->access$402(Landroid/net/wifi/WifiEnterpriseConfig;Ljava/security/PrivateKey;)Ljava/security/PrivateKey;,blocked
-Landroid/net/wifi/WifiEnterpriseConfig;->access$502(Landroid/net/wifi/WifiEnterpriseConfig;[Ljava/security/cert/X509Certificate;)[Ljava/security/cert/X509Certificate;,blocked
-Landroid/net/wifi/WifiEnterpriseConfig;->access$602(Landroid/net/wifi/WifiEnterpriseConfig;Ljava/lang/String;)Ljava/lang/String;,blocked
-Landroid/net/wifi/WifiEnterpriseConfig;->access$702(Landroid/net/wifi/WifiEnterpriseConfig;Z)Z,blocked
-Landroid/net/wifi/WifiEnterpriseConfig;->access$802(Landroid/net/wifi/WifiEnterpriseConfig;Z)Z,blocked
-Landroid/net/wifi/WifiEnterpriseConfig;->access$902(Landroid/net/wifi/WifiEnterpriseConfig;I)I,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->convertToQuotedString(Ljava/lang/String;)Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiEnterpriseConfig;->copyFrom(Landroid/net/wifi/WifiEnterpriseConfig;ZLjava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiEnterpriseConfig;->copyFromExternal(Landroid/net/wifi/WifiEnterpriseConfig;Ljava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiEnterpriseConfig;->decodeCaCertificateAlias(Ljava/lang/String;)Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiEnterpriseConfig;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->enableTrustOnFirstUse(Z)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->encodeCaCertificateAlias(Ljava/lang/String;)Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiEnterpriseConfig;->getAltSubjectMatch()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->getAnonymousIdentity()Ljava/lang/String;,public-api,sdk,system-api,test-api
@@ -2555,9 +3064,11 @@
 Landroid/net/wifi/WifiEnterpriseConfig;->getPhase2Method()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->getPlmn()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->getRealm()Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->getSelectedRcoi()J,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->getStringIndex([Ljava/lang/String;Ljava/lang/String;I)I,lo-prio,max-target-o
 Landroid/net/wifi/WifiEnterpriseConfig;->getSubjectMatch()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->getWapiCertSuite()Ljava/lang/String;,sdk,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->hasCaCertificate()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->initIsAppInstalledCaCert(Z)V,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->initIsAppInstalledDeviceKeyAndCert(Z)V,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->isAppInstalledCaCert()Z,blocked
@@ -2568,6 +3079,8 @@
 Landroid/net/wifi/WifiEnterpriseConfig;->isMandatoryParameterSetForServerCertValidation()Z,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->isServerCertValidationEnabled()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->isSuiteBCipherCert(Ljava/security/cert/X509Certificate;)Z,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->isTrustOnFirstUseEnabled()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->isUserApproveNoCaCert()Z,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->loadFromSupplicant(Landroid/net/wifi/WifiEnterpriseConfig$SupplicantLoader;)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiEnterpriseConfig;->mCaCerts:[Ljava/security/cert/X509Certificate;,lo-prio,max-target-o
 Landroid/net/wifi/WifiEnterpriseConfig;->mClientCertificateChain:[Ljava/security/cert/X509Certificate;,lo-prio,max-target-o
@@ -2576,9 +3089,12 @@
 Landroid/net/wifi/WifiEnterpriseConfig;->mFields:Ljava/util/HashMap;,unsupported
 Landroid/net/wifi/WifiEnterpriseConfig;->mIsAppInstalledCaCert:Z,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->mIsAppInstalledDeviceKeyAndCert:Z,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->mIsTrustOnFirstUseEnabled:Z,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->mKeyChainAlias:Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->mOcsp:I,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->mPhase2Method:I,lo-prio,max-target-o
+Landroid/net/wifi/WifiEnterpriseConfig;->mSelectedRcoi:J,blocked
+Landroid/net/wifi/WifiEnterpriseConfig;->mUserApproveNoCaCert:Z,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiEnterpriseConfig;->resetCaCertificate()V,lo-prio,max-target-o
 Landroid/net/wifi/WifiEnterpriseConfig;->resetClientKeyEntry()V,lo-prio,max-target-o
@@ -2588,6 +3104,7 @@
 Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificate(Ljava/security/cert/X509Certificate;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateAlias(Ljava/lang/String;)V,unsupported
 Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateAliases([Ljava/lang/String;)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateForTrustOnFirstUse(Ljava/security/cert/X509Certificate;)V,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificates([Ljava/security/cert/X509Certificate;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->setCaPath(Ljava/lang/String;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->setClientCertificateAlias(Ljava/lang/String;)V,sdk,system-api,test-api
@@ -2605,43 +3122,33 @@
 Landroid/net/wifi/WifiEnterpriseConfig;->setPhase2Method(I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->setPlmn(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->setRealm(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->setSelectedRcoi(J)V,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->setSubjectMatch(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->setUserApproveNoCaCert(Z)V,blocked
 Landroid/net/wifi/WifiEnterpriseConfig;->setWapiCertSuite(Ljava/lang/String;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda0;-><clinit>()V,blocked
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda0;-><init>()V,blocked
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda0;->INSTANCE:Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda0;,blocked
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda0;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda1;-><clinit>()V,blocked
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda1;-><init>()V,blocked
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda1;->INSTANCE:Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda1;,blocked
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda1;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda2;-><clinit>()V,blocked
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda2;-><init>()V,blocked
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda2;->INSTANCE:Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda2;,blocked
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda2;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda3;-><clinit>()V,blocked
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda3;-><init>()V,blocked
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda3;->INSTANCE:Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda3;,blocked
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda3;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda4;-><clinit>()V,blocked
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda4;-><init>()V,blocked
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda4;->INSTANCE:Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda4;,blocked
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda4;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda5;-><clinit>()V,blocked
+Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda4;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda5;-><init>()V,blocked
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda5;->INSTANCE:Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda5;,blocked
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda5;->createService(Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
+Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda5;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
+Landroid/net/wifi/WifiFrameworkInitializer$NoPreloadHolder;->-$$Nest$sfgetINSTANCE()Landroid/os/HandlerThread;,blocked
 Landroid/net/wifi/WifiFrameworkInitializer$NoPreloadHolder;-><clinit>()V,blocked
 Landroid/net/wifi/WifiFrameworkInitializer$NoPreloadHolder;-><init>()V,blocked
 Landroid/net/wifi/WifiFrameworkInitializer$NoPreloadHolder;->INSTANCE:Landroid/os/HandlerThread;,blocked
-Landroid/net/wifi/WifiFrameworkInitializer$NoPreloadHolder;->access$000()Landroid/os/HandlerThread;,blocked
 Landroid/net/wifi/WifiFrameworkInitializer$NoPreloadHolder;->createInstance()Landroid/os/HandlerThread;,blocked
 Landroid/net/wifi/WifiFrameworkInitializer;-><init>()V,blocked
 Landroid/net/wifi/WifiFrameworkInitializer;->getInstanceLooper()Landroid/os/Looper;,blocked
 Landroid/net/wifi/WifiFrameworkInitializer;->lambda$registerServiceWrappers$0(Landroid/content/Context;Landroid/os/IBinder;)Landroid/net/wifi/WifiManager;,blocked
-Landroid/net/wifi/WifiFrameworkInitializer;->lambda$registerServiceWrappers$1(Landroid/os/IBinder;)Landroid/net/wifi/p2p/WifiP2pManager;,blocked
+Landroid/net/wifi/WifiFrameworkInitializer;->lambda$registerServiceWrappers$1(Landroid/content/Context;Landroid/os/IBinder;)Landroid/net/wifi/p2p/WifiP2pManager;,blocked
 Landroid/net/wifi/WifiFrameworkInitializer;->lambda$registerServiceWrappers$2(Landroid/content/Context;Landroid/os/IBinder;)Landroid/net/wifi/aware/WifiAwareManager;,blocked
 Landroid/net/wifi/WifiFrameworkInitializer;->lambda$registerServiceWrappers$3(Landroid/content/Context;Landroid/os/IBinder;)Landroid/net/wifi/WifiScanner;,blocked
 Landroid/net/wifi/WifiFrameworkInitializer;->lambda$registerServiceWrappers$4(Landroid/content/Context;Landroid/os/IBinder;)Landroid/net/wifi/rtt/WifiRttManager;,blocked
@@ -2652,20 +3159,60 @@
 Landroid/net/wifi/WifiInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo$1;->newArray(I)[Landroid/net/wifi/WifiInfo;,blocked
 Landroid/net/wifi/WifiInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiInfo$2;-><init>(Landroid/net/wifi/WifiInfo;)V,blocked
+Landroid/net/wifi/WifiInfo$2;->compare(Landroid/net/wifi/MloLink;Landroid/net/wifi/MloLink;)I,blocked
+Landroid/net/wifi/WifiInfo$2;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiInfo$2;->this$0:Landroid/net/wifi/WifiInfo;,blocked
 Landroid/net/wifi/WifiInfo$Builder;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo$Builder;->build()Landroid/net/wifi/WifiInfo;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo$Builder;->mWifiInfo:Landroid/net/wifi/WifiInfo;,blocked
+Landroid/net/wifi/WifiInfo$Builder;->setAffiliatedMloLinks(Ljava/util/List;)Landroid/net/wifi/WifiInfo$Builder;,blocked
+Landroid/net/wifi/WifiInfo$Builder;->setApMldMacAddress(Landroid/net/MacAddress;)Landroid/net/wifi/WifiInfo$Builder;,blocked
+Landroid/net/wifi/WifiInfo$Builder;->setApMloLinkId(I)Landroid/net/wifi/WifiInfo$Builder;,blocked
 Landroid/net/wifi/WifiInfo$Builder;->setBssid(Ljava/lang/String;)Landroid/net/wifi/WifiInfo$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo$Builder;->setCurrentSecurityType(I)Landroid/net/wifi/WifiInfo$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo$Builder;->setNetworkId(I)Landroid/net/wifi/WifiInfo$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo$Builder;->setRssi(I)Landroid/net/wifi/WifiInfo$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo$Builder;->setSsid([B)Landroid/net/wifi/WifiInfo$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmAffiliatedMloLinks(Landroid/net/wifi/WifiInfo;Ljava/util/List;)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmApMldMacAddress(Landroid/net/wifi/WifiInfo;Landroid/net/MacAddress;)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmApMloLinkId(Landroid/net/wifi/WifiInfo;I)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmBSSID(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmCarrierMerged(Landroid/net/wifi/WifiInfo;Z)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmEphemeral(Landroid/net/wifi/WifiInfo;Z)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmFqdn(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmInformationElements(Landroid/net/wifi/WifiInfo;Ljava/util/List;)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmIsPrimary(Landroid/net/wifi/WifiInfo;I)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmIsUsable(Landroid/net/wifi/WifiInfo;Z)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmLostTxPacketsPerSecond(Landroid/net/wifi/WifiInfo;D)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmMacAddress(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmMaxSupportedRxLinkSpeed(Landroid/net/wifi/WifiInfo;I)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmMaxSupportedTxLinkSpeed(Landroid/net/wifi/WifiInfo;I)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmMeteredHint(Landroid/net/wifi/WifiInfo;Z)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmNetworkKey(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmOemPaid(Landroid/net/wifi/WifiInfo;Z)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmOemPrivate(Landroid/net/wifi/WifiInfo;Z)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmOsuAp(Landroid/net/wifi/WifiInfo;Z)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmPasspointUniqueId(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmProviderFriendlyName(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmRequestingPackageName(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmRestricted(Landroid/net/wifi/WifiInfo;Z)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmSecurityType(Landroid/net/wifi/WifiInfo;I)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmSubscriptionId(Landroid/net/wifi/WifiInfo;I)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmSuccessfulRxPacketsPerSecond(Landroid/net/wifi/WifiInfo;D)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmSuccessfulTxPacketsPerSecond(Landroid/net/wifi/WifiInfo;D)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmSupplicantState(Landroid/net/wifi/WifiInfo;Landroid/net/wifi/SupplicantState;)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmTrusted(Landroid/net/wifi/WifiInfo;Z)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmTxRetriedTxPacketsPerSecond(Landroid/net/wifi/WifiInfo;D)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmWifiSsid(Landroid/net/wifi/WifiInfo;Landroid/net/wifi/WifiSsid;)V,blocked
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmWifiStandard(Landroid/net/wifi/WifiInfo;I)V,blocked
 Landroid/net/wifi/WifiInfo;-><clinit>()V,blocked
 Landroid/net/wifi/WifiInfo;-><init>()V,unsupported
 Landroid/net/wifi/WifiInfo;-><init>(Landroid/net/wifi/WifiInfo;)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiInfo;-><init>(Landroid/net/wifi/WifiInfo;J)V,blocked
 Landroid/net/wifi/WifiInfo;->CREATOR:Landroid/os/Parcelable$Creator;,unsupported
 Landroid/net/wifi/WifiInfo;->DEFAULT_MAC_ADDRESS:Ljava/lang/String;,sdk,system-api,test-api
+Landroid/net/wifi/WifiInfo;->DPM_SECURITY_TYPE_UNKNOWN:I,blocked
 Landroid/net/wifi/WifiInfo;->FREQUENCY_UNITS:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->INVALID_RSSI:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->IS_PRIMARY_FALSE:I,blocked
@@ -2675,6 +3222,7 @@
 Landroid/net/wifi/WifiInfo;->LINK_SPEED_UNKNOWN:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->MAX_RSSI:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiInfo;->MIN_RSSI:I,lo-prio,max-target-o
+Landroid/net/wifi/WifiInfo;->SECURITY_TYPE_DPP:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->SECURITY_TYPE_EAP:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->SECURITY_TYPE_EAP_WPA3_ENTERPRISE:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT:I,public-api,sdk,system-api,test-api
@@ -2690,36 +3238,14 @@
 Landroid/net/wifi/WifiInfo;->SECURITY_TYPE_WAPI_PSK:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->SECURITY_TYPE_WEP:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->TAG:Ljava/lang/String;,lo-prio,max-target-o
-Landroid/net/wifi/WifiInfo;->access$002(Landroid/net/wifi/WifiInfo;Landroid/net/wifi/WifiSsid;)Landroid/net/wifi/WifiSsid;,blocked
-Landroid/net/wifi/WifiInfo;->access$1002(Landroid/net/wifi/WifiInfo;D)D,blocked
-Landroid/net/wifi/WifiInfo;->access$102(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)Ljava/lang/String;,blocked
-Landroid/net/wifi/WifiInfo;->access$1102(Landroid/net/wifi/WifiInfo;D)D,blocked
-Landroid/net/wifi/WifiInfo;->access$1202(Landroid/net/wifi/WifiInfo;D)D,blocked
-Landroid/net/wifi/WifiInfo;->access$1302(Landroid/net/wifi/WifiInfo;Landroid/net/wifi/SupplicantState;)Landroid/net/wifi/SupplicantState;,blocked
-Landroid/net/wifi/WifiInfo;->access$1402(Landroid/net/wifi/WifiInfo;Z)Z,blocked
-Landroid/net/wifi/WifiInfo;->access$1502(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)Ljava/lang/String;,blocked
-Landroid/net/wifi/WifiInfo;->access$1602(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)Ljava/lang/String;,blocked
-Landroid/net/wifi/WifiInfo;->access$1702(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)Ljava/lang/String;,blocked
-Landroid/net/wifi/WifiInfo;->access$1802(Landroid/net/wifi/WifiInfo;I)I,blocked
-Landroid/net/wifi/WifiInfo;->access$1902(Landroid/net/wifi/WifiInfo;I)I,blocked
-Landroid/net/wifi/WifiInfo;->access$2002(Landroid/net/wifi/WifiInfo;I)I,blocked
-Landroid/net/wifi/WifiInfo;->access$202(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)Ljava/lang/String;,blocked
-Landroid/net/wifi/WifiInfo;->access$2102(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)Ljava/lang/String;,blocked
-Landroid/net/wifi/WifiInfo;->access$2202(Landroid/net/wifi/WifiInfo;I)I,blocked
-Landroid/net/wifi/WifiInfo;->access$2302(Landroid/net/wifi/WifiInfo;Ljava/util/List;)Ljava/util/List;,blocked
-Landroid/net/wifi/WifiInfo;->access$2402(Landroid/net/wifi/WifiInfo;I)I,blocked
-Landroid/net/wifi/WifiInfo;->access$2502(Landroid/net/wifi/WifiInfo;I)I,blocked
-Landroid/net/wifi/WifiInfo;->access$302(Landroid/net/wifi/WifiInfo;Z)Z,blocked
-Landroid/net/wifi/WifiInfo;->access$402(Landroid/net/wifi/WifiInfo;Z)Z,blocked
-Landroid/net/wifi/WifiInfo;->access$502(Landroid/net/wifi/WifiInfo;Z)Z,blocked
-Landroid/net/wifi/WifiInfo;->access$602(Landroid/net/wifi/WifiInfo;Z)Z,blocked
-Landroid/net/wifi/WifiInfo;->access$702(Landroid/net/wifi/WifiInfo;Z)Z,blocked
-Landroid/net/wifi/WifiInfo;->access$802(Landroid/net/wifi/WifiInfo;Z)Z,blocked
-Landroid/net/wifi/WifiInfo;->access$902(Landroid/net/wifi/WifiInfo;D)D,blocked
 Landroid/net/wifi/WifiInfo;->clearCurrentSecurityType()V,blocked
-Landroid/net/wifi/WifiInfo;->convertSecurityTypeToWifiInfo(I)I,blocked
+Landroid/net/wifi/WifiInfo;->convertSecurityTypeToDpmWifiSecurity(I)I,blocked
+Landroid/net/wifi/WifiInfo;->convertWifiConfigurationSecurityType(I)I,blocked
 Landroid/net/wifi/WifiInfo;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiInfo;->getAffiliatedMloLinks()Ljava/util/List;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiInfo;->getApMldMacAddress()Landroid/net/MacAddress;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiInfo;->getApMloLinkId()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getApplicableRedactions()J,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getBSSID()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getCurrentSecurityType()I,public-api,sdk,system-api,test-api
@@ -2735,6 +3261,7 @@
 Landroid/net/wifi/WifiInfo;->getMaxSupportedTxLinkSpeedMbps()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getMeteredHint()Z,unsupported
 Landroid/net/wifi/WifiInfo;->getNetworkId()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiInfo;->getNetworkKey()Ljava/lang/String;,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getPasspointFqdn()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getPasspointProviderFriendlyName()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getPasspointUniqueId()Ljava/lang/String;,blocked
@@ -2744,6 +3271,7 @@
 Landroid/net/wifi/WifiInfo;->getRxLinkSpeedMbps()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getSSID()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getScore()I,sdk,system-api,test-api
+Landroid/net/wifi/WifiInfo;->getSortedMloLinkList(Ljava/util/List;)Ljava/util/List;,blocked
 Landroid/net/wifi/WifiInfo;->getSubscriptionId()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getSuccessfulRxPacketsPerSecond()D,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getSuccessfulTxPacketsPerSecond()D,sdk,system-api,test-api
@@ -2763,7 +3291,12 @@
 Landroid/net/wifi/WifiInfo;->isOsuAp()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->isPasspointAp()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->isPrimary()Z,sdk,system-api,test-api
+Landroid/net/wifi/WifiInfo;->isRestricted()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->isTrusted()Z,sdk,system-api,test-api
+Landroid/net/wifi/WifiInfo;->isUsable()Z,blocked
+Landroid/net/wifi/WifiInfo;->mAffiliatedMloLinks:Ljava/util/List;,blocked
+Landroid/net/wifi/WifiInfo;->mApMldMacAddress:Landroid/net/MacAddress;,blocked
+Landroid/net/wifi/WifiInfo;->mApMloLinkId:I,blocked
 Landroid/net/wifi/WifiInfo;->mBSSID:Ljava/lang/String;,max-target-p
 Landroid/net/wifi/WifiInfo;->mCarrierMerged:Z,blocked
 Landroid/net/wifi/WifiInfo;->mEphemeral:Z,lo-prio,max-target-o
@@ -2771,7 +3304,9 @@
 Landroid/net/wifi/WifiInfo;->mFrequency:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiInfo;->mInformationElements:Ljava/util/List;,blocked
 Landroid/net/wifi/WifiInfo;->mIpAddress:Ljava/net/InetAddress;,unsupported
+Landroid/net/wifi/WifiInfo;->mIsHiddenSsid:Z,blocked
 Landroid/net/wifi/WifiInfo;->mIsPrimary:I,blocked
+Landroid/net/wifi/WifiInfo;->mIsUsable:Z,blocked
 Landroid/net/wifi/WifiInfo;->mLinkSpeed:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiInfo;->mLostTxPacketsPerSecond:D,blocked
 Landroid/net/wifi/WifiInfo;->mMacAddress:Ljava/lang/String;,unsupported
@@ -2779,12 +3314,14 @@
 Landroid/net/wifi/WifiInfo;->mMaxSupportedTxLinkSpeed:I,blocked
 Landroid/net/wifi/WifiInfo;->mMeteredHint:Z,lo-prio,max-target-o
 Landroid/net/wifi/WifiInfo;->mNetworkId:I,lo-prio,max-target-o
+Landroid/net/wifi/WifiInfo;->mNetworkKey:Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiInfo;->mOemPaid:Z,blocked
 Landroid/net/wifi/WifiInfo;->mOemPrivate:Z,blocked
 Landroid/net/wifi/WifiInfo;->mOsuAp:Z,blocked
 Landroid/net/wifi/WifiInfo;->mPasspointUniqueId:Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiInfo;->mProviderFriendlyName:Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiInfo;->mRequestingPackageName:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiInfo;->mRestricted:Z,blocked
 Landroid/net/wifi/WifiInfo;->mRssi:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiInfo;->mRxLinkSpeed:I,blocked
 Landroid/net/wifi/WifiInfo;->mSecurityType:I,blocked
@@ -2801,15 +3338,20 @@
 Landroid/net/wifi/WifiInfo;->makeCopy(J)Landroid/net/wifi/WifiInfo;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String;,unsupported
 Landroid/net/wifi/WifiInfo;->reset()V,lo-prio,max-target-o
+Landroid/net/wifi/WifiInfo;->resetMultiLinkInfo()V,blocked
 Landroid/net/wifi/WifiInfo;->rxSuccess:J,lo-prio,max-target-o
 Landroid/net/wifi/WifiInfo;->sanitizeSsid(Ljava/lang/String;)Ljava/lang/String;,sdk,system-api,test-api
 Landroid/net/wifi/WifiInfo;->score:I,unsupported
+Landroid/net/wifi/WifiInfo;->setAffiliatedMloLinks(Ljava/util/List;)V,blocked
+Landroid/net/wifi/WifiInfo;->setApMldMacAddress(Landroid/net/MacAddress;)V,blocked
+Landroid/net/wifi/WifiInfo;->setApMloLinkId(I)V,blocked
 Landroid/net/wifi/WifiInfo;->setBSSID(Ljava/lang/String;)V,unsupported
 Landroid/net/wifi/WifiInfo;->setCarrierMerged(Z)V,blocked
 Landroid/net/wifi/WifiInfo;->setCurrentSecurityType(I)V,blocked
 Landroid/net/wifi/WifiInfo;->setEphemeral(Z)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiInfo;->setFQDN(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/WifiInfo;->setFrequency(I)V,lo-prio,max-target-o
+Landroid/net/wifi/WifiInfo;->setHiddenSSID(Z)V,blocked
 Landroid/net/wifi/WifiInfo;->setInetAddress(Ljava/net/InetAddress;)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiInfo;->setInformationElements(Ljava/util/List;)V,blocked
 Landroid/net/wifi/WifiInfo;->setIsPrimary(Z)V,blocked
@@ -2820,12 +3362,14 @@
 Landroid/net/wifi/WifiInfo;->setMaxSupportedTxLinkSpeedMbps(I)V,blocked
 Landroid/net/wifi/WifiInfo;->setMeteredHint(Z)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiInfo;->setNetworkId(I)V,unsupported
+Landroid/net/wifi/WifiInfo;->setNetworkKey(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/WifiInfo;->setOemPaid(Z)V,blocked
 Landroid/net/wifi/WifiInfo;->setOemPrivate(Z)V,blocked
 Landroid/net/wifi/WifiInfo;->setOsuAp(Z)V,blocked
 Landroid/net/wifi/WifiInfo;->setPasspointUniqueId(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/WifiInfo;->setProviderFriendlyName(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/WifiInfo;->setRequestingPackageName(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiInfo;->setRestricted(Z)V,blocked
 Landroid/net/wifi/WifiInfo;->setRetriedTxPacketsRate(D)V,blocked
 Landroid/net/wifi/WifiInfo;->setRssi(I)V,unsupported
 Landroid/net/wifi/WifiInfo;->setRxLinkSpeedMbps(I)V,blocked
@@ -2838,6 +3382,7 @@
 Landroid/net/wifi/WifiInfo;->setSupplicantState(Ljava/lang/String;)V,unsupported
 Landroid/net/wifi/WifiInfo;->setTrusted(Z)V,blocked
 Landroid/net/wifi/WifiInfo;->setTxLinkSpeedMbps(I)V,blocked
+Landroid/net/wifi/WifiInfo;->setUsable(Z)V,blocked
 Landroid/net/wifi/WifiInfo;->setWifiStandard(I)V,blocked
 Landroid/net/wifi/WifiInfo;->shouldRedactLocalMacAddressFields(J)Z,blocked
 Landroid/net/wifi/WifiInfo;->shouldRedactLocationSensitiveFields(J)Z,blocked
@@ -2847,48 +3392,89 @@
 Landroid/net/wifi/WifiInfo;->txBad:J,lo-prio,max-target-o
 Landroid/net/wifi/WifiInfo;->txRetries:J,lo-prio,max-target-o
 Landroid/net/wifi/WifiInfo;->txSuccess:J,lo-prio,max-target-o
+Landroid/net/wifi/WifiInfo;->updateMloLinkStaAddress(ILandroid/net/MacAddress;)Z,blocked
+Landroid/net/wifi/WifiInfo;->updateMloLinkState(II)Z,blocked
 Landroid/net/wifi/WifiInfo;->valueOf(Ljava/lang/String;)Landroid/net/wifi/SupplicantState;,lo-prio,max-target-o
 Landroid/net/wifi/WifiInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V,blocked
-Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;,blocked
-Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->f$1:I,blocked
-Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->f$2:Z,blocked
-Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->f$3:Landroid/net/wifi/WifiUsabilityStatsEntry;,blocked
+Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;-><init>(Ljava/util/function/Consumer;Z)V,blocked
+Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->f$0:Ljava/util/function/Consumer;,blocked
+Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->f$1:Z,blocked
 Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$1;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;)V,blocked
-Landroid/net/wifi/WifiManager$1;->lambda$onWifiUsabilityStats$0(Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V,blocked
-Landroid/net/wifi/WifiManager$1;->onWifiUsabilityStats(IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V,blocked
+Landroid/net/wifi/WifiManager$1;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,blocked
+Landroid/net/wifi/WifiManager$1;->lambda$onResult$0(Ljava/util/function/Consumer;Z)V,blocked
+Landroid/net/wifi/WifiManager$1;->onResult(Z)V,blocked
 Landroid/net/wifi/WifiManager$1;->this$0:Landroid/net/wifi/WifiManager;,blocked
 Landroid/net/wifi/WifiManager$1;->val$executor:Ljava/util/concurrent/Executor;,blocked
-Landroid/net/wifi/WifiManager$1;->val$listener:Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;,blocked
-Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;Z)V,blocked
-Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;,blocked
-Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->f$1:Z,blocked
+Landroid/net/wifi/WifiManager$1;->val$resultsCallback:Ljava/util/function/Consumer;,blocked
+Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V,blocked
+Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;,blocked
+Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->f$1:I,blocked
+Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->f$2:Z,blocked
+Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->f$3:Landroid/net/wifi/WifiUsabilityStatsEntry;,blocked
 Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$2;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V,blocked
-Landroid/net/wifi/WifiManager$2;->lambda$onStatusChanged$0(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;Z)V,blocked
-Landroid/net/wifi/WifiManager$2;->onStatusChanged(Z)V,blocked
+Landroid/net/wifi/WifiManager$2;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;)V,blocked
+Landroid/net/wifi/WifiManager$2;->lambda$onWifiUsabilityStats$0(Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V,blocked
+Landroid/net/wifi/WifiManager$2;->onWifiUsabilityStats(IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V,blocked
 Landroid/net/wifi/WifiManager$2;->this$0:Landroid/net/wifi/WifiManager;,blocked
 Landroid/net/wifi/WifiManager$2;->val$executor:Ljava/util/concurrent/Executor;,blocked
-Landroid/net/wifi/WifiManager$2;->val$listener:Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;,blocked
+Landroid/net/wifi/WifiManager$2;->val$listener:Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;,blocked
+Landroid/net/wifi/WifiManager$3$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;Z)V,blocked
+Landroid/net/wifi/WifiManager$3$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;,blocked
+Landroid/net/wifi/WifiManager$3$$ExternalSyntheticLambda0;->f$1:Z,blocked
+Landroid/net/wifi/WifiManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$3;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V,blocked
+Landroid/net/wifi/WifiManager$3;->lambda$onStatusChanged$0(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;Z)V,blocked
+Landroid/net/wifi/WifiManager$3;->onStatusChanged(Z)V,blocked
+Landroid/net/wifi/WifiManager$3;->this$0:Landroid/net/wifi/WifiManager;,blocked
+Landroid/net/wifi/WifiManager$3;->val$executor:Ljava/util/concurrent/Executor;,blocked
+Landroid/net/wifi/WifiManager$3;->val$listener:Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;,blocked
+Landroid/net/wifi/WifiManager$4$$ExternalSyntheticLambda0;-><init>(Ljava/util/function/BiConsumer;Ljava/lang/String;Z)V,blocked
+Landroid/net/wifi/WifiManager$4$$ExternalSyntheticLambda0;->f$0:Ljava/util/function/BiConsumer;,blocked
+Landroid/net/wifi/WifiManager$4$$ExternalSyntheticLambda0;->f$1:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager$4$$ExternalSyntheticLambda0;->f$2:Z,blocked
+Landroid/net/wifi/WifiManager$4$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$4;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Ljava/util/function/BiConsumer;)V,blocked
+Landroid/net/wifi/WifiManager$4;->lambda$onResult$0(Ljava/util/function/BiConsumer;Ljava/lang/String;Z)V,blocked
+Landroid/net/wifi/WifiManager$4;->onResult(Ljava/lang/String;Z)V,blocked
+Landroid/net/wifi/WifiManager$4;->this$0:Landroid/net/wifi/WifiManager;,blocked
+Landroid/net/wifi/WifiManager$4;->val$executor:Ljava/util/concurrent/Executor;,blocked
+Landroid/net/wifi/WifiManager$4;->val$resultsCallback:Ljava/util/function/BiConsumer;,blocked
+Landroid/net/wifi/WifiManager$5$$ExternalSyntheticLambda0;-><init>(Ljava/util/function/BiConsumer;ZLjava/util/Set;)V,blocked
+Landroid/net/wifi/WifiManager$5$$ExternalSyntheticLambda0;->f$0:Ljava/util/function/BiConsumer;,blocked
+Landroid/net/wifi/WifiManager$5$$ExternalSyntheticLambda0;->f$1:Z,blocked
+Landroid/net/wifi/WifiManager$5$$ExternalSyntheticLambda0;->f$2:Ljava/util/Set;,blocked
+Landroid/net/wifi/WifiManager$5$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$5;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Ljava/util/function/BiConsumer;)V,blocked
+Landroid/net/wifi/WifiManager$5;->lambda$onResults$0(Ljava/util/function/BiConsumer;ZLjava/util/Set;)V,blocked
+Landroid/net/wifi/WifiManager$5;->onResults(Z[I[Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiManager$5;->this$0:Landroid/net/wifi/WifiManager;,blocked
+Landroid/net/wifi/WifiManager$5;->val$executor:Ljava/util/concurrent/Executor;,blocked
+Landroid/net/wifi/WifiManager$5;->val$resultCallback:Ljava/util/function/BiConsumer;,blocked
+Landroid/net/wifi/WifiManager$ActionListener;->FAILURE_BUSY:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$ActionListener;->FAILURE_INTERNAL_ERROR:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$ActionListener;->FAILURE_INVALID_ARGS:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$ActionListener;->FAILURE_IN_PROGRESS:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$ActionListener;->FAILURE_NOT_AUTHORIZED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$ActionListener;->onFailure(I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$ActionListener;->onSuccess()V,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$ActionListenerProxy;)V,blocked
+Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$ActionListenerProxy;I)V,blocked
 Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$ActionListenerProxy;,blocked
+Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda0;->f$1:I,blocked
 Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$ActionListenerProxy;I)V,blocked
+Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$ActionListenerProxy;)V,blocked
 Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$ActionListenerProxy;,blocked
-Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda1;->f$1:I,blocked
 Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$ActionListenerProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/lang/String;Landroid/os/Looper;Landroid/net/wifi/WifiManager$ActionListener;)V,blocked
-Landroid/net/wifi/WifiManager$ActionListenerProxy;->lambda$onFailure$1$WifiManager$ActionListenerProxy(I)V,blocked
-Landroid/net/wifi/WifiManager$ActionListenerProxy;->lambda$onSuccess$0$WifiManager$ActionListenerProxy()V,blocked
+Landroid/net/wifi/WifiManager$ActionListenerProxy;->lambda$onFailure$1$android-net-wifi-WifiManager$ActionListenerProxy(I)V,blocked
+Landroid/net/wifi/WifiManager$ActionListenerProxy;->lambda$onSuccess$0$android-net-wifi-WifiManager$ActionListenerProxy()V,blocked
 Landroid/net/wifi/WifiManager$ActionListenerProxy;->mActionTag:Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiManager$ActionListenerProxy;->mCallback:Landroid/net/wifi/WifiManager$ActionListener;,blocked
 Landroid/net/wifi/WifiManager$ActionListenerProxy;->mHandler:Landroid/os/Handler;,blocked
 Landroid/net/wifi/WifiManager$ActionListenerProxy;->onFailure(I)V,blocked
 Landroid/net/wifi/WifiManager$ActionListenerProxy;->onSuccess()V,blocked
 Landroid/net/wifi/WifiManager$ActionListenerProxy;->this$0:Landroid/net/wifi/WifiManager;,blocked
+Landroid/net/wifi/WifiManager$ActiveCountryCodeChangedCallback;->onActiveCountryCodeChanged(Ljava/lang/String;)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$ActiveCountryCodeChangedCallback;->onCountryCodeInactive()V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$AddNetworkResult$1;-><init>()V,blocked
 Landroid/net/wifi/WifiManager$AddNetworkResult$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/WifiManager$AddNetworkResult;,blocked
 Landroid/net/wifi/WifiManager$AddNetworkResult$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -2929,35 +3515,35 @@
 Landroid/net/wifi/WifiManager$CoexCallback;->getProxy()Landroid/net/wifi/WifiManager$CoexCallback$CoexCallbackProxy;,blocked
 Landroid/net/wifi/WifiManager$CoexCallback;->mCoexCallbackProxy:Landroid/net/wifi/WifiManager$CoexCallback$CoexCallbackProxy;,blocked
 Landroid/net/wifi/WifiManager$CoexCallback;->onCoexUnsafeChannelsChanged(Ljava/util/List;I)V,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;I)V,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;Ljava/lang/String;)V,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda0;->f$1:I,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda0;->f$1:Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;I)V,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;Ljava/lang/String;ILjava/lang/String;[I)V,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->f$1:I,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->f$1:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->f$2:I,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->f$3:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->f$4:[I,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;I)V,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda2;->f$1:I,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;I)V,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda3;->f$0:Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda3;->f$1:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda3;->f$1:I,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;Ljava/lang/String;ILjava/lang/String;[I)V,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;I)V,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->f$0:Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->f$1:Ljava/lang/String;,blocked
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->f$2:I,blocked
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->f$3:Ljava/lang/String;,blocked
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->f$4:[I,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->f$1:I,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;-><init>(Ljava/util/concurrent/Executor;Landroid/net/wifi/EasyConnectStatusCallback;)V,blocked
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onBootstrapUriGenerated$4$WifiManager$EasyConnectCallbackProxy(Ljava/lang/String;)V,blocked
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onFailure$2$WifiManager$EasyConnectCallbackProxy(Ljava/lang/String;ILjava/lang/String;[I)V,blocked
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onProgress$3$WifiManager$EasyConnectCallbackProxy(I)V,blocked
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onSuccess$1$WifiManager$EasyConnectCallbackProxy(I)V,blocked
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onSuccessConfigReceived$0$WifiManager$EasyConnectCallbackProxy(I)V,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onBootstrapUriGenerated$4$android-net-wifi-WifiManager$EasyConnectCallbackProxy(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onFailure$2$android-net-wifi-WifiManager$EasyConnectCallbackProxy(Ljava/lang/String;ILjava/lang/String;[I)V,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onProgress$3$android-net-wifi-WifiManager$EasyConnectCallbackProxy(I)V,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onSuccess$1$android-net-wifi-WifiManager$EasyConnectCallbackProxy(I)V,blocked
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onSuccessConfigReceived$0$android-net-wifi-WifiManager$EasyConnectCallbackProxy(I)V,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->mEasyConnectStatusCallback:Landroid/net/wifi/EasyConnectStatusCallback;,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->onBootstrapUriGenerated(Ljava/lang/String;)V,blocked
@@ -2965,6 +3551,13 @@
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->onProgress(I)V,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->onSuccess(I)V,blocked
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->onSuccessConfigReceived(I)V,blocked
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;-><init>(ILjava/util/Set;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;->getInterfaceType()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;->getPackages()Ljava/util/Set;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;->mInterfaceType:I,blocked
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;->mPackages:Ljava/util/Set;,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;->ERROR_GENERIC:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;->ERROR_INCOMPATIBLE_MODE:I,public-api,sdk,system-api,test-api
@@ -2974,21 +3567,21 @@
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;->onFailed(I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;->onStarted(Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;->onStopped()V,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;)V,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;)V,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda0;->f$1:Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;I)V,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;)V,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda1;->f$1:I,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;)V,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;I)V,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda2;->f$1:I,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;)V,blocked
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->lambda$onHotspotFailed$2$WifiManager$LocalOnlyHotspotCallbackProxy(I)V,blocked
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->lambda$onHotspotStarted$0$WifiManager$LocalOnlyHotspotCallbackProxy(Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;)V,blocked
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->lambda$onHotspotStopped$1$WifiManager$LocalOnlyHotspotCallbackProxy()V,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->lambda$onHotspotFailed$2$android-net-wifi-WifiManager$LocalOnlyHotspotCallbackProxy(I)V,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->lambda$onHotspotStarted$0$android-net-wifi-WifiManager$LocalOnlyHotspotCallbackProxy(Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;)V,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->lambda$onHotspotStopped$1$android-net-wifi-WifiManager$LocalOnlyHotspotCallbackProxy()V,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->mCallback:Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->mWifiManager:Ljava/lang/ref/WeakReference;,lo-prio,max-target-o
@@ -2999,21 +3592,21 @@
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;->onRegistered(Landroid/net/wifi/WifiManager$LocalOnlyHotspotSubscription;)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;->onStarted(Landroid/net/wifi/SoftApConfiguration;)V,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;->onStopped()V,lo-prio,max-target-o
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;)V,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;Landroid/net/wifi/SoftApConfiguration;)V,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda0;->f$1:Landroid/net/wifi/SoftApConfiguration;,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;Landroid/net/wifi/SoftApConfiguration;)V,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;)V,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;,blocked
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/SoftApConfiguration;,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;Landroid/net/wifi/WifiManager;)V,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/WifiManager;,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;)V,blocked
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->lambda$onHotspotStarted$1$WifiManager$LocalOnlyHotspotObserverProxy(Landroid/net/wifi/SoftApConfiguration;)V,blocked
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->lambda$onHotspotStopped$2$WifiManager$LocalOnlyHotspotObserverProxy()V,blocked
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->lambda$registered$0$WifiManager$LocalOnlyHotspotObserverProxy(Landroid/net/wifi/WifiManager;)V,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->lambda$onHotspotStarted$1$android-net-wifi-WifiManager$LocalOnlyHotspotObserverProxy(Landroid/net/wifi/SoftApConfiguration;)V,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->lambda$onHotspotStopped$2$android-net-wifi-WifiManager$LocalOnlyHotspotObserverProxy()V,blocked
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->lambda$registered$0$android-net-wifi-WifiManager$LocalOnlyHotspotObserverProxy(Landroid/net/wifi/WifiManager;)V,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->mExecutor:Ljava/util/concurrent/Executor;,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->mObserver:Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->mWifiManager:Ljava/lang/ref/WeakReference;,lo-prio,max-target-o
@@ -3037,7 +3630,7 @@
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotSubscription;->mCloseGuard:Landroid/util/CloseGuard;,blocked
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotSubscription;->this$0:Landroid/net/wifi/WifiManager;,blocked
 Landroid/net/wifi/WifiManager$MulticastLock;-><init>(Landroid/net/wifi/WifiManager;Ljava/lang/String;)V,blocked
-Landroid/net/wifi/WifiManager$MulticastLock;-><init>(Landroid/net/wifi/WifiManager;Ljava/lang/String;Landroid/net/wifi/WifiManager$1;)V,blocked
+Landroid/net/wifi/WifiManager$MulticastLock;-><init>(Landroid/net/wifi/WifiManager;Ljava/lang/String;Landroid/net/wifi/WifiManager$MulticastLock-IA;)V,blocked
 Landroid/net/wifi/WifiManager$MulticastLock;->acquire()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$MulticastLock;->finalize()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$MulticastLock;->isHeld()Z,public-api,sdk,system-api,test-api
@@ -3055,31 +3648,31 @@
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;->onUserSelectionCallbackRegistration(Landroid/net/wifi/WifiManager$NetworkRequestUserSelectionCallback;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;->onUserSelectionConnectFailure(Landroid/net/wifi/WifiConfiguration;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;->onUserSelectionConnectSuccess(Landroid/net/wifi/WifiConfiguration;)V,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;)V,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Landroid/net/wifi/WifiConfiguration;)V,blocked
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda0;->f$1:Landroid/net/wifi/WifiConfiguration;,blocked
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Landroid/net/wifi/INetworkRequestUserSelectionCallback;)V,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Landroid/net/wifi/WifiConfiguration;)V,blocked
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/INetworkRequestUserSelectionCallback;,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/WifiConfiguration;,blocked
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Landroid/net/wifi/WifiConfiguration;)V,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;)V,blocked
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/WifiConfiguration;,blocked
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Landroid/net/wifi/WifiConfiguration;)V,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Ljava/util/List;)V,blocked
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda3;->f$0:Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda3;->f$1:Landroid/net/wifi/WifiConfiguration;,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda3;->f$1:Ljava/util/List;,blocked
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Ljava/util/List;)V,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Landroid/net/wifi/INetworkRequestUserSelectionCallback;)V,blocked
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda4;->f$0:Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda4;->f$1:Ljava/util/List;,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda4;->f$1:Landroid/net/wifi/INetworkRequestUserSelectionCallback;,blocked
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;)V,blocked
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onAbort$1$WifiManager$NetworkRequestMatchCallbackProxy()V,blocked
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onMatch$2$WifiManager$NetworkRequestMatchCallbackProxy(Ljava/util/List;)V,blocked
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onUserSelectionCallbackRegistration$0$WifiManager$NetworkRequestMatchCallbackProxy(Landroid/net/wifi/INetworkRequestUserSelectionCallback;)V,blocked
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onUserSelectionConnectFailure$4$WifiManager$NetworkRequestMatchCallbackProxy(Landroid/net/wifi/WifiConfiguration;)V,blocked
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onUserSelectionConnectSuccess$3$WifiManager$NetworkRequestMatchCallbackProxy(Landroid/net/wifi/WifiConfiguration;)V,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onAbort$1$android-net-wifi-WifiManager$NetworkRequestMatchCallbackProxy()V,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onMatch$2$android-net-wifi-WifiManager$NetworkRequestMatchCallbackProxy(Ljava/util/List;)V,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onUserSelectionCallbackRegistration$0$android-net-wifi-WifiManager$NetworkRequestMatchCallbackProxy(Landroid/net/wifi/INetworkRequestUserSelectionCallback;)V,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onUserSelectionConnectFailure$4$android-net-wifi-WifiManager$NetworkRequestMatchCallbackProxy(Landroid/net/wifi/WifiConfiguration;)V,blocked
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onUserSelectionConnectSuccess$3$android-net-wifi-WifiManager$NetworkRequestMatchCallbackProxy(Landroid/net/wifi/WifiConfiguration;)V,blocked
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->mCallback:Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;,blocked
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;,blocked
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->onAbort()V,blocked
@@ -3095,6 +3688,19 @@
 Landroid/net/wifi/WifiManager$NetworkRequestUserSelectionCallbackProxy;->reject()V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$NetworkRequestUserSelectionCallbackProxy;->select(Landroid/net/wifi/WifiConfiguration;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$NetworkRequestUserSelectionCallbackProxy;->this$0:Landroid/net/wifi/WifiManager;,blocked
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;,blocked
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda0;->f$1:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;)V,blocked
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;,blocked
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;-><init>(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$ActiveCountryCodeChangedCallback;)V,blocked
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;->lambda$onDriverCountryCodeChanged$0$android-net-wifi-WifiManager$OnDriverCountryCodeChangedProxy(Ljava/lang/String;)V,blocked
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;->lambda$onDriverCountryCodeChanged$1$android-net-wifi-WifiManager$OnDriverCountryCodeChangedProxy()V,blocked
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;->mCallback:Landroid/net/wifi/WifiManager$ActiveCountryCodeChangedCallback;,blocked
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;->mExecutor:Ljava/util/concurrent/Executor;,blocked
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;->onDriverCountryCodeChanged(Ljava/lang/String;)V,blocked
 Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoListener;->onWifiActivityEnergyInfo(Landroid/os/connectivity/WifiActivityEnergyInfo;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoListener;Landroid/os/connectivity/WifiActivityEnergyInfo;)V,blocked
 Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoListener;,blocked
@@ -3107,21 +3713,59 @@
 Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoProxy;->mLock:Ljava/lang/Object;,blocked
 Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoProxy;->onWifiActivityEnergyInfo(Landroid/os/connectivity/WifiActivityEnergyInfo;)V,blocked
 Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;->onWifiUsabilityStats(IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;)V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REGISTER_PNO_CALLBACK_ALREADY_REGISTERED:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REGISTER_PNO_CALLBACK_PNO_NOT_SUPPORTED:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REGISTER_PNO_CALLBACK_RESOURCE_BUSY:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REGISTER_PNO_CALLBACK_UNKNOWN:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REMOVE_PNO_CALLBACK_RESULTS_DELIVERED:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REMOVE_PNO_CALLBACK_UNKNOWN:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REMOVE_PNO_CALLBACK_UNREGISTERED:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->onRegisterFailed(I)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->onRegisterSuccess()V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->onRemoved(I)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->onScanResultsAvailable(Ljava/util/List;)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;I)V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda0;->f$1:I,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;I)V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda1;->f$1:I,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;)V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;Ljava/util/List;)V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda3;->f$0:Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda3;->f$1:Ljava/util/List;,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$PnoScanResultsCallback;)V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->lambda$onRegisterFailed$2$android-net-wifi-WifiManager$PnoScanResultsCallbackProxy(I)V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->lambda$onRegisterSuccess$1$android-net-wifi-WifiManager$PnoScanResultsCallbackProxy()V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->lambda$onRemoved$3$android-net-wifi-WifiManager$PnoScanResultsCallbackProxy(I)V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->lambda$onScanResultsAvailable$0$android-net-wifi-WifiManager$PnoScanResultsCallbackProxy(Ljava/util/List;)V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->mCallback:Landroid/net/wifi/WifiManager$PnoScanResultsCallback;,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->onRegisterFailed(I)V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->onRegisterSuccess()V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->onRemoved(I)V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->onScanResultsAvailable(Ljava/util/List;)V,blocked
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->this$0:Landroid/net/wifi/WifiManager;,blocked
+Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;I)V,blocked
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;,blocked
+Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda0;->f$1:I,blocked
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;I)V,blocked
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;,blocked
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda1;->f$1:I,blocked
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;I)V,blocked
+Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;)V,blocked
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda2;->f$1:I,blocked
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;-><init>(Ljava/util/concurrent/Executor;Landroid/net/wifi/hotspot2/ProvisioningCallback;)V,blocked
-Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->lambda$onProvisioningComplete$2$WifiManager$ProvisioningCallbackProxy()V,blocked
-Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->lambda$onProvisioningFailure$1$WifiManager$ProvisioningCallbackProxy(I)V,blocked
-Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->lambda$onProvisioningStatus$0$WifiManager$ProvisioningCallbackProxy(I)V,blocked
+Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->lambda$onProvisioningComplete$2$android-net-wifi-WifiManager$ProvisioningCallbackProxy()V,blocked
+Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->lambda$onProvisioningFailure$1$android-net-wifi-WifiManager$ProvisioningCallbackProxy(I)V,blocked
+Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->lambda$onProvisioningStatus$0$android-net-wifi-WifiManager$ProvisioningCallbackProxy(I)V,blocked
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->mCallback:Landroid/net/wifi/hotspot2/ProvisioningCallback;,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;,blocked
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->onProvisioningComplete()V,blocked
@@ -3147,7 +3791,7 @@
 Landroid/net/wifi/WifiManager$ScoreUpdateObserver;->requestNudOperation(I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$ScoreUpdateObserver;->triggerUpdateOfWifiUsabilityStats(I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;-><init>(Landroid/net/wifi/WifiManager;Landroid/net/wifi/IScoreUpdateObserver;)V,blocked
-Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;-><init>(Landroid/net/wifi/WifiManager;Landroid/net/wifi/IScoreUpdateObserver;Landroid/net/wifi/WifiManager$1;)V,blocked
+Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;-><init>(Landroid/net/wifi/WifiManager;Landroid/net/wifi/IScoreUpdateObserver;Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy-IA;)V,blocked
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;->blocklistCurrentBssid(I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;->mScoreUpdateObserver:Landroid/net/wifi/IScoreUpdateObserver;,blocked
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;->notifyScoreUpdate(II)V,sdk,system-api,test-api
@@ -3155,6 +3799,11 @@
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;->requestNudOperation(I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;->this$0:Landroid/net/wifi/WifiManager;,blocked
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;->triggerUpdateOfWifiUsabilityStats(I)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$ScreenOnScanSchedule;-><init>(Ljava/time/Duration;I)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$ScreenOnScanSchedule;->getScanInterval()Ljava/time/Duration;,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$ScreenOnScanSchedule;->getScanType()I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager$ScreenOnScanSchedule;->mScanInterval:Ljava/time/Duration;,blocked
+Landroid/net/wifi/WifiManager$ScreenOnScanSchedule;->mScanType:I,blocked
 Landroid/net/wifi/WifiManager$SoftApCallback;->onBlockedClientConnecting(Landroid/net/wifi/WifiClient;I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$SoftApCallback;->onCapabilityChanged(Landroid/net/wifi/SoftApCapability;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$SoftApCallback;->onConnectedClientsChanged(Landroid/net/wifi/SoftApInfo;Ljava/util/List;)V,sdk,system-api,test-api
@@ -3162,50 +3811,51 @@
 Landroid/net/wifi/WifiManager$SoftApCallback;->onInfoChanged(Landroid/net/wifi/SoftApInfo;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$SoftApCallback;->onInfoChanged(Ljava/util/List;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$SoftApCallback;->onStateChanged(II)V,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;II)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/SoftApCapability;)V,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;->f$1:I,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;->f$2:I,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;->f$1:Landroid/net/wifi/SoftApCapability;,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/SoftApCapability;)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/SoftApInfo;Ljava/util/Map;)V,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/SoftApCapability;,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/SoftApInfo;,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;->f$2:Ljava/util/Map;,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/SoftApInfo;)V,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/SoftApInfo;,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/SoftApInfo;Ljava/util/Map;)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Ljava/util/List;)V,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;->f$1:Landroid/net/wifi/SoftApInfo;,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;->f$2:Ljava/util/Map;,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;->f$1:Ljava/util/List;,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/WifiClient;I)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Ljava/util/Map;)V,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;->f$1:Landroid/net/wifi/WifiClient;,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;->f$2:I,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;->f$1:Ljava/util/Map;,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Ljava/util/List;)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/WifiClient;I)V,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;->f$1:Ljava/util/List;,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;->f$1:Landroid/net/wifi/WifiClient;,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;->f$2:I,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Ljava/util/Map;)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;II)V,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;->f$1:Ljava/util/Map;,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;->f$1:I,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;->f$2:I,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SoftApCallback;)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SoftApCallback;I)V,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->getConnectedClientList(Ljava/util/Map;)Ljava/util/List;,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onBlockedClientConnecting$6$WifiManager$SoftApCallbackProxy(Landroid/net/wifi/WifiClient;I)V,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onCapabilityChanged$5$WifiManager$SoftApCallbackProxy(Landroid/net/wifi/SoftApCapability;)V,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$1$WifiManager$SoftApCallbackProxy(Landroid/net/wifi/SoftApInfo;Ljava/util/Map;)V,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$2$WifiManager$SoftApCallbackProxy(Landroid/net/wifi/SoftApInfo;)V,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$3$WifiManager$SoftApCallbackProxy(Ljava/util/List;)V,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$4$WifiManager$SoftApCallbackProxy(Ljava/util/Map;)V,blocked
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onStateChanged$0$WifiManager$SoftApCallbackProxy(II)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onBlockedClientConnecting$6$android-net-wifi-WifiManager$SoftApCallbackProxy(Landroid/net/wifi/WifiClient;I)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onCapabilityChanged$5$android-net-wifi-WifiManager$SoftApCallbackProxy(Landroid/net/wifi/SoftApCapability;)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$1$android-net-wifi-WifiManager$SoftApCallbackProxy(Landroid/net/wifi/SoftApInfo;Ljava/util/Map;)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$2$android-net-wifi-WifiManager$SoftApCallbackProxy(Landroid/net/wifi/SoftApInfo;)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$3$android-net-wifi-WifiManager$SoftApCallbackProxy(Ljava/util/List;)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$4$android-net-wifi-WifiManager$SoftApCallbackProxy(Ljava/util/Map;)V,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onStateChanged$0$android-net-wifi-WifiManager$SoftApCallbackProxy(II)V,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->mCallback:Landroid/net/wifi/WifiManager$SoftApCallback;,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->mCurrentClients:Ljava/util/Map;,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->mCurrentInfos:Ljava/util/Map;,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;,blocked
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->mIpMode:I,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->onBlockedClientConnecting(Landroid/net/wifi/WifiClient;I)V,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->onCapabilityChanged(Landroid/net/wifi/SoftApCapability;)V,blocked
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->onConnectedClientsOrInfoChanged(Ljava/util/Map;Ljava/util/Map;ZZ)V,blocked
@@ -3237,7 +3887,7 @@
 Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy$$ExternalSyntheticLambda0;->f$2:I,blocked
 Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListener;)V,blocked
-Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy;->lambda$onConnectionStatus$0$WifiManager$SuggestionConnectionStatusListenerProxy(Landroid/net/wifi/WifiNetworkSuggestion;I)V,blocked
+Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy;->lambda$onConnectionStatus$0$android-net-wifi-WifiManager$SuggestionConnectionStatusListenerProxy(Landroid/net/wifi/WifiNetworkSuggestion;I)V,blocked
 Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy;->mExecutor:Ljava/util/concurrent/Executor;,blocked
 Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy;->mListener:Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListener;,blocked
 Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy;->onConnectionStatus(Landroid/net/wifi/WifiNetworkSuggestion;I)V,blocked
@@ -3248,7 +3898,7 @@
 Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy$$ExternalSyntheticLambda0;->f$1:I,blocked
 Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListener;)V,blocked
-Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy;->lambda$onUserApprovalStatusChange$0$WifiManager$SuggestionUserApprovalStatusListenerProxy(I)V,blocked
+Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy;->lambda$onUserApprovalStatusChange$0$android-net-wifi-WifiManager$SuggestionUserApprovalStatusListenerProxy(I)V,blocked
 Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy;->mExecutor:Ljava/util/concurrent/Executor;,blocked
 Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy;->mListener:Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListener;,blocked
 Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy;->onUserApprovalStatusChange(I)V,blocked
@@ -3263,7 +3913,7 @@
 Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy$$ExternalSyntheticLambda0;->f$1:I,blocked
 Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$TrafficStateCallback;)V,blocked
-Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy;->lambda$onStateChanged$0$WifiManager$TrafficStateCallbackProxy(I)V,blocked
+Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy;->lambda$onStateChanged$0$android-net-wifi-WifiManager$TrafficStateCallbackProxy(I)V,blocked
 Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy;->mCallback:Landroid/net/wifi/WifiManager$TrafficStateCallback;,blocked
 Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;,blocked
 Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy;->onStateChanged(I)V,blocked
@@ -3272,22 +3922,22 @@
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorer;->onStart(I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorer;->onStart(Landroid/net/wifi/WifiConnectedSessionInfo;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorer;->onStop(I)V,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;I)V,blocked
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;Landroid/net/wifi/WifiConnectedSessionInfo;)V,blocked
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;,blocked
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda0;->f$1:I,blocked
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda0;->f$1:Landroid/net/wifi/WifiConnectedSessionInfo;,blocked
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;Landroid/net/wifi/IScoreUpdateObserver;)V,blocked
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;I)V,blocked
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;,blocked
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/IScoreUpdateObserver;,blocked
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda1;->f$1:I,blocked
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;Landroid/net/wifi/WifiConnectedSessionInfo;)V,blocked
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;Landroid/net/wifi/IScoreUpdateObserver;)V,blocked
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;,blocked
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/WifiConnectedSessionInfo;,blocked
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/IScoreUpdateObserver;,blocked
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorer;)V,blocked
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->lambda$onSetScoreUpdateObserver$2$WifiManager$WifiConnectedNetworkScorerProxy(Landroid/net/wifi/IScoreUpdateObserver;)V,blocked
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->lambda$onStart$0$WifiManager$WifiConnectedNetworkScorerProxy(Landroid/net/wifi/WifiConnectedSessionInfo;)V,blocked
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->lambda$onStop$1$WifiManager$WifiConnectedNetworkScorerProxy(I)V,blocked
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->lambda$onSetScoreUpdateObserver$2$android-net-wifi-WifiManager$WifiConnectedNetworkScorerProxy(Landroid/net/wifi/IScoreUpdateObserver;)V,blocked
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->lambda$onStart$0$android-net-wifi-WifiManager$WifiConnectedNetworkScorerProxy(Landroid/net/wifi/WifiConnectedSessionInfo;)V,blocked
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->lambda$onStop$1$android-net-wifi-WifiManager$WifiConnectedNetworkScorerProxy(I)V,blocked
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->mExecutor:Ljava/util/concurrent/Executor;,blocked
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->mScorer:Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorer;,blocked
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->onSetScoreUpdateObserver(Landroid/net/wifi/IScoreUpdateObserver;)V,blocked
@@ -3295,7 +3945,7 @@
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->onStop(I)V,blocked
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->this$0:Landroid/net/wifi/WifiManager;,blocked
 Landroid/net/wifi/WifiManager$WifiLock;-><init>(Landroid/net/wifi/WifiManager;ILjava/lang/String;)V,blocked
-Landroid/net/wifi/WifiManager$WifiLock;-><init>(Landroid/net/wifi/WifiManager;ILjava/lang/String;Landroid/net/wifi/WifiManager$1;)V,blocked
+Landroid/net/wifi/WifiManager$WifiLock;-><init>(Landroid/net/wifi/WifiManager;ILjava/lang/String;Landroid/net/wifi/WifiManager$WifiLock-IA;)V,blocked
 Landroid/net/wifi/WifiManager$WifiLock;->acquire()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiLock;->finalize()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiLock;->isHeld()Z,public-api,sdk,system-api,test-api
@@ -3316,8 +3966,15 @@
 Landroid/net/wifi/WifiManager$WpsCallback;->onFailed(I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WpsCallback;->onStarted(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager$WpsCallback;->onSucceeded()V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->-$$Nest$fgetmActiveLockCount(Landroid/net/wifi/WifiManager;)I,blocked
+Landroid/net/wifi/WifiManager;->-$$Nest$fgetmLock(Landroid/net/wifi/WifiManager;)Ljava/lang/Object;,blocked
+Landroid/net/wifi/WifiManager;->-$$Nest$fgetmVerboseLoggingEnabled(Landroid/net/wifi/WifiManager;)Z,blocked
+Landroid/net/wifi/WifiManager;->-$$Nest$fputmActiveLockCount(Landroid/net/wifi/WifiManager;I)V,blocked
+Landroid/net/wifi/WifiManager;->-$$Nest$mstopLocalOnlyHotspot(Landroid/net/wifi/WifiManager;)V,blocked
 Landroid/net/wifi/WifiManager;-><clinit>()V,blocked
 Landroid/net/wifi/WifiManager;-><init>(Landroid/content/Context;Landroid/net/wifi/IWifiManager;Landroid/os/Looper;)V,lo-prio,max-target-o
+Landroid/net/wifi/WifiManager;->ACTION_DISMISS_DIALOG:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager;->ACTION_LAUNCH_DIALOG:Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiManager;->ACTION_LINK_CONFIGURATION_CHANGED:Ljava/lang/String;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_NETWORK_SETTINGS_RESET:Ljava/lang/String;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_PASSPOINT_DEAUTH_IMMINENT:Ljava/lang/String;,lo-prio,max-target-o
@@ -3327,14 +3984,23 @@
 Landroid/net/wifi/WifiManager;->ACTION_PASSPOINT_SUBSCRIPTION_REMEDIATION:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->ACTION_PICK_WIFI_NETWORK:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_REFRESH_USER_PROVISIONING:Ljava/lang/String;,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->ACTION_REMOVE_SUGGESTION_DISCONNECT:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->ACTION_REMOVE_SUGGESTION_LINGER:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_REQUEST_DISABLE:Ljava/lang/String;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_REQUEST_ENABLE:Ljava/lang/String;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_WIFI_NETWORK_SUGGESTION_POST_CONNECTION:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_WIFI_SCAN_AVAILABILITY_CHANGED:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->ALL_ZEROS_MAC_ADDRESS:Landroid/net/MacAddress;,blocked
+Landroid/net/wifi/WifiManager;->API_AUTOJOIN_GLOBAL:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_MAX:I,blocked
+Landroid/net/wifi/WifiManager;->API_SCANNING_ENABLED:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_SET_ONE_SHOT_SCREEN_ON_CONNECTIVITY_SCAN_DELAY:I,blocked
+Landroid/net/wifi/WifiManager;->API_SET_SCAN_SCHEDULE:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_SOFT_AP:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_TETHERED_HOTSPOT:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_WIFI_ENABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->BATCHED_SCAN_RESULTS_AVAILABLE_ACTION:Ljava/lang/String;,lo-prio,max-target-o
-Landroid/net/wifi/WifiManager;->BUSY:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->CHANGE_REASON_ADDED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->CHANGE_REASON_CONFIG_CHANGE:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->CHANGE_REASON_REMOVED:I,sdk,system-api,test-api
@@ -3347,6 +4013,14 @@
 Landroid/net/wifi/WifiManager;->DEVICE_MOBILITY_STATE_LOW_MVMT:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->DEVICE_MOBILITY_STATE_STATIONARY:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->DEVICE_MOBILITY_STATE_UNKNOWN:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->DIALOG_REPLY_CANCELLED:I,blocked
+Landroid/net/wifi/WifiManager;->DIALOG_REPLY_NEGATIVE:I,blocked
+Landroid/net/wifi/WifiManager;->DIALOG_REPLY_NEUTRAL:I,blocked
+Landroid/net/wifi/WifiManager;->DIALOG_REPLY_POSITIVE:I,blocked
+Landroid/net/wifi/WifiManager;->DIALOG_TYPE_P2P_INVITATION_RECEIVED:I,blocked
+Landroid/net/wifi/WifiManager;->DIALOG_TYPE_P2P_INVITATION_SENT:I,blocked
+Landroid/net/wifi/WifiManager;->DIALOG_TYPE_SIMPLE:I,blocked
+Landroid/net/wifi/WifiManager;->DIALOG_TYPE_UNKNOWN:I,blocked
 Landroid/net/wifi/WifiManager;->EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP256R1:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP384R1:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP512R1:I,sdk,system-api,test-api
@@ -3356,7 +4030,6 @@
 Landroid/net/wifi/WifiManager;->EASY_CONNECT_DEVICE_INFO_MAXIMUM_LENGTH:I,blocked
 Landroid/net/wifi/WifiManager;->EASY_CONNECT_NETWORK_ROLE_AP:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->EASY_CONNECT_NETWORK_ROLE_STA:I,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager;->ERROR:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->ERROR_AUTHENTICATING:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->ERROR_AUTH_FAILURE_EAP_FAILURE:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->ERROR_AUTH_FAILURE_NONE:I,lo-prio,max-target-o
@@ -3367,6 +4040,16 @@
 Landroid/net/wifi/WifiManager;->EXTRA_BSSID_LONG:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->EXTRA_CHANGE_REASON:Ljava/lang/String;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->EXTRA_DELAY:Ljava/lang/String;,lo-prio,max-target-o
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_ID:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_MESSAGE:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_MESSAGE_URL:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_MESSAGE_URL_END:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_MESSAGE_URL_START:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_NEGATIVE_BUTTON_TEXT:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_NEUTRAL_BUTTON_TEXT:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_POSITIVE_BUTTON_TEXT:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_TITLE:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_TYPE:Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiManager;->EXTRA_ESS:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->EXTRA_FILENAME:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->EXTRA_ICON:Ljava/lang/String;,lo-prio,max-target-o
@@ -3378,6 +4061,10 @@
 Landroid/net/wifi/WifiManager;->EXTRA_NEW_RSSI:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->EXTRA_NEW_STATE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->EXTRA_OSU_NETWORK:Ljava/lang/String;,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->EXTRA_P2P_DEVICE_NAME:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager;->EXTRA_P2P_DISPLAY_PIN:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager;->EXTRA_P2P_PIN_REQUESTED:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiManager;->EXTRA_PARAM_KEY_ATTRIBUTION_SOURCE:Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiManager;->EXTRA_PREVIOUS_WIFI_AP_STATE:Ljava/lang/String;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->EXTRA_PREVIOUS_WIFI_STATE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->EXTRA_RESULTS_UPDATED:Ljava/lang/String;,public-api,sdk,system-api,test-api
@@ -3400,8 +4087,7 @@
 Landroid/net/wifi/WifiManager;->IFACE_IP_MODE_LOCAL_ONLY:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->IFACE_IP_MODE_TETHERED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->IFACE_IP_MODE_UNSPECIFIED:I,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager;->INVALID_ARGS:I,lo-prio,max-target-o
-Landroid/net/wifi/WifiManager;->IN_PROGRESS:I,lo-prio,max-target-o
+Landroid/net/wifi/WifiManager;->INVALID_DIALOG_ID:I,blocked
 Landroid/net/wifi/WifiManager;->LINK_CONFIGURATION_CHANGED_ACTION:Ljava/lang/String;,max-target-r
 Landroid/net/wifi/WifiManager;->MAX_ACTIVE_LOCKS:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->MAX_RSSI:I,unsupported
@@ -3410,7 +4096,6 @@
 Landroid/net/wifi/WifiManager;->NETWORK_STATE_CHANGED_ACTION:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->NETWORK_SUGGESTIONS_MAX_PER_APP_HIGH_RAM:I,blocked
 Landroid/net/wifi/WifiManager;->NETWORK_SUGGESTIONS_MAX_PER_APP_LOW_RAM:I,blocked
-Landroid/net/wifi/WifiManager;->NOT_AUTHORIZED:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->PASSPOINT_HOME_NETWORK:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->PASSPOINT_ROAMING_NETWORK:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->RSSI_CHANGED_ACTION:Ljava/lang/String;,public-api,sdk,system-api,test-api
@@ -3429,6 +4114,7 @@
 Landroid/net/wifi/WifiManager;->STATUS_NETWORK_SUGGESTIONS_ERROR_APP_DISALLOWED:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->STATUS_NETWORK_SUGGESTIONS_ERROR_INTERNAL:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->STATUS_NETWORK_SUGGESTIONS_ERROR_REMOVE_INVALID:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->STATUS_NETWORK_SUGGESTIONS_ERROR_RESTRICTED_BY_ADMIN:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->STATUS_NETWORK_SUGGESTIONS_SUCCESS:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->STATUS_SUGGESTION_APPROVAL_APPROVED_BY_CARRIER_PRIVILEGE:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->STATUS_SUGGESTION_APPROVAL_APPROVED_BY_USER:I,public-api,sdk,system-api,test-api
@@ -3458,6 +4144,7 @@
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_ADDITIONAL_STA:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_ADDITIONAL_STA_LOCAL_ONLY:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_ADDITIONAL_STA_MBB:J,blocked
+Landroid/net/wifi/WifiManager;->WIFI_FEATURE_ADDITIONAL_STA_MULTI_INTERNET:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_ADDITIONAL_STA_RESTRICTED:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_AP_RAND_MAC:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_AP_STA:J,blocked
@@ -3471,6 +4158,7 @@
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_D2D_RTT:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_DECORATED_IDENTITY:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_DPP:J,blocked
+Landroid/net/wifi/WifiManager;->WIFI_FEATURE_DPP_AKM:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_DPP_ENROLLEE_RESPONDER:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_EPR:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_FILS_SHA256:J,blocked
@@ -3501,6 +4189,7 @@
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TDLS:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TDLS_OFFCHANNEL:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TRANSMIT_POWER:J,blocked
+Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TRUST_ON_FIRST_USE:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TX_POWER_LIMIT:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_WAPI:J,blocked
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_WFD_R2:J,blocked
@@ -3509,11 +4198,18 @@
 Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_2GHZ:I,unsupported
 Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_5GHZ:I,unsupported
 Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_AUTO:I,unsupported
+Landroid/net/wifi/WifiManager;->WIFI_INTERFACE_TYPE_AP:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->WIFI_INTERFACE_TYPE_AWARE:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->WIFI_INTERFACE_TYPE_DIRECT:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->WIFI_INTERFACE_TYPE_STA:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_MODE_FULL:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_MODE_FULL_HIGH_PERF:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_MODE_FULL_LOW_LATENCY:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_MODE_NO_LOCKS_HELD:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->WIFI_MODE_SCAN_ONLY:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->WIFI_MULTI_INTERNET_MODE_DBS_AP:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->WIFI_MULTI_INTERNET_MODE_DISABLED:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->WIFI_MULTI_INTERNET_MODE_MULTI_AP:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_STATE_CHANGED_ACTION:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_STATE_DISABLED:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_STATE_DISABLING:I,public-api,sdk,system-api,test-api
@@ -3525,12 +4221,7 @@
 Landroid/net/wifi/WifiManager;->WPS_TIMED_OUT:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WPS_TKIP_ONLY_PROHIBITED:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->WPS_WEP_PROHIBITED:I,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiManager;->access$000(Landroid/net/wifi/WifiManager;)Z,blocked
-Landroid/net/wifi/WifiManager;->access$100(Landroid/net/wifi/WifiManager;)Ljava/lang/Object;,blocked
-Landroid/net/wifi/WifiManager;->access$200(Landroid/net/wifi/WifiManager;)V,blocked
-Landroid/net/wifi/WifiManager;->access$300(Landroid/net/wifi/WifiManager;)I,blocked
-Landroid/net/wifi/WifiManager;->access$308(Landroid/net/wifi/WifiManager;)I,blocked
-Landroid/net/wifi/WifiManager;->access$310(Landroid/net/wifi/WifiManager;)I,blocked
+Landroid/net/wifi/WifiManager;->addCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[BLjava/util/List;)V,blocked
 Landroid/net/wifi/WifiManager;->addNetwork(Landroid/net/wifi/WifiConfiguration;)I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->addNetworkPrivileged(Landroid/net/wifi/WifiConfiguration;)Landroid/net/wifi/WifiManager$AddNetworkResult;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->addNetworkSuggestions(Ljava/util/List;)I,public-api,sdk,system-api,test-api
@@ -3541,12 +4232,13 @@
 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;->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
-Landroid/net/wifi/WifiManager;->allowAutojoinGlobal(Z)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->allowAutojoinGlobal(Z)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->allowAutojoinPasspoint(Ljava/lang/String;Z)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->calculateSignalLevel(I)I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->calculateSignalLevel(II)I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V,unsupported
 Landroid/net/wifi/WifiManager;->cancelWps(Landroid/net/wifi/WifiManager$WpsCallback;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->clearExternalPnoScanRequest()V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->clearOverrideCountryCode()V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->clearWifiConnectedNetworkScorer()V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->compareSignalLevel(II)I,public-api,sdk,system-api,test-api
@@ -3577,6 +4269,7 @@
 Landroid/net/wifi/WifiManager;->getEasyConnectMaxAllowedResponderDeviceInfoLength()I,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getEnableAutoJoinWhenAssociated()Z,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->getFactoryMacAddresses()[Ljava/lang/String;,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->getLastCallerInfoForApi(ILjava/util/concurrent/Executor;Ljava/util/function/BiConsumer;)V,sdk,system-api,test-api
 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
@@ -3584,10 +4277,14 @@
 Landroid/net/wifi/WifiManager;->getMaxNumberOfNetworkSuggestionsPerApp(Z)I,blocked
 Landroid/net/wifi/WifiManager;->getMaxSignalLevel()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getNetworkSuggestions()Ljava/util/List;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->getOemPrivilegedWifiAdminPackages()Ljava/util/Set;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getPasspointConfigurations()Ljava/util/List;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getPrivilegedConfiguredNetworks()Ljava/util/List;,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->getPrivilegedConnectedNetwork()Landroid/net/wifi/WifiConfiguration;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getScanResults()Ljava/util/List;,public-api,sdk,system-api,test-api
 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;->getSupportedFeatures()J,blocked
 Landroid/net/wifi/WifiManager;->getUsableChannels(II)Ljava/util/List;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->getVerboseLoggingLevel()I,sdk,system-api,test-api
@@ -3610,6 +4307,7 @@
 Landroid/net/wifi/WifiManager;->isDefaultCoexAlgorithmEnabled()Z,blocked
 Landroid/net/wifi/WifiManager;->isDeviceToApRttSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isDeviceToDeviceRttSupported()Z,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->isEasyConnectDppAkmSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isEasyConnectEnrolleeResponderModeSupported()Z,public-api,sdk,system-api,test-api
 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
@@ -3628,14 +4326,17 @@
 Landroid/net/wifi/WifiManager;->isStaApConcurrencySupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isStaBridgedApConcurrencySupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isStaConcurrencyForLocalOnlyConnectionsSupported()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->isStaConcurrencyForMultiInternetSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isStaConcurrencyForRestrictedConnectionsSupported()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isTdlsSupported()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->isTrustOnFirstUseSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isVerboseLoggingEnabled()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWapiSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWifiApEnabled()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWifiAwareSupported()Z,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->isWifiDisplayR2Supported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWifiEnabled()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->isWifiPasspointEnabled()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWifiScannerSupported()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWifiStandardSupported(I)Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWpa3SaeH2eSupported()Z,public-api,sdk,system-api,test-api
@@ -3652,32 +4353,44 @@
 Landroid/net/wifi/WifiManager;->mTargetSdkVersion:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->mVerboseLoggingEnabled:Z,blocked
 Landroid/net/wifi/WifiManager;->matchProviderWithCurrentNetwork(Ljava/lang/String;)I,lo-prio,max-target-o
+Landroid/net/wifi/WifiManager;->notifyMinimumRequiredWifiSecurityLevelChanged(I)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->notifyWifiSsidPolicyChanged(Landroid/app/admin/WifiSsidPolicy;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->parseDppChannelList(Ljava/lang/String;)Landroid/util/SparseArray;,blocked
 Landroid/net/wifi/WifiManager;->pingSupplicant()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->queryAutojoinGlobal(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->queryPasspointIcon(JLjava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->reassociate()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->reconnect()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->registerActiveCountryCodeChangedCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$ActiveCountryCodeChangedCallback;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->registerCoexCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$CoexCallback;)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->registerLocalOnlyHotspotSoftApCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SoftApCallback;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->registerNetworkRequestMatchCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->registerScanResultsCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$ScanResultsCallback;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->registerSoftApCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SoftApCallback;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->registerSubsystemRestartTrackingCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SubsystemRestartTrackingCallback;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->registerTrafficStateCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$TrafficStateCallback;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeAppState(ILjava/lang/String;)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->removeCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[B)V,blocked
 Landroid/net/wifi/WifiManager;->removeNetwork(I)Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeNetworkSuggestions(Ljava/util/List;)I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->removeNetworkSuggestions(Ljava/util/List;I)I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeNonCallerConfiguredNetworks()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeOnWifiUsabilityStatsListener(Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->removePasspointConfiguration(Ljava/lang/String;)V,public-api,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;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->replyToP2pInvitationReceivedDialog(IZLjava/lang/String;)V,blocked
+Landroid/net/wifi/WifiManager;->replyToSimpleDialog(II)V,blocked
+Landroid/net/wifi/WifiManager;->reportCreateInterfaceImpact(IZLjava/util/concurrent/Executor;Ljava/util/function/BiConsumer;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->restartWifiSubsystem()V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->restoreBackupData([B)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->restoreSoftApBackupData([B)Landroid/net/wifi/SoftApConfiguration;,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->restoreSupplicantBackupData([B[B)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->retrieveBackupData()[B,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->retrieveSoftApBackupData()[B,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->sActiveCountryCodeChangedCallbackMap:Landroid/util/SparseArray;,blocked
+Landroid/net/wifi/WifiManager;->sLocalOnlyHotspotSoftApCallbackMap:Landroid/util/SparseArray;,blocked
 Landroid/net/wifi/WifiManager;->sNetworkRequestMatchCallbackMap:Landroid/util/SparseArray;,blocked
 Landroid/net/wifi/WifiManager;->sOnWifiUsabilityStatsListenerMap:Landroid/util/SparseArray;,blocked
 Landroid/net/wifi/WifiManager;->sSoftApCallbackMap:Landroid/util/SparseArray;,blocked
@@ -3694,12 +4407,17 @@
 Landroid/net/wifi/WifiManager;->setDeviceMobilityState(I)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setEmergencyScanRequestInProgress(Z)V,blocked
 Landroid/net/wifi/WifiManager;->setEnableAutoJoinWhenAssociated(Z)Z,lo-prio,max-target-o
+Landroid/net/wifi/WifiManager;->setExternalPnoScanRequest(Ljava/util/List;[ILjava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$PnoScanResultsCallback;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setMacRandomizationSettingPasspointEnabled(Ljava/lang/String;Z)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->setOneShotScreenOnConnectivityScanDelayMillis(I)V,blocked
 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;->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
 Landroid/net/wifi/WifiManager;->setSoftApConfiguration(Landroid/net/wifi/SoftApConfiguration;)Z,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->setSsidsAllowlist(Ljava/util/Set;)V,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->setStaConcurrencyForMultiInternetMode(I)Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setTdlsEnabled(Ljava/net/InetAddress;Z)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setTdlsEnabledWithMacAddress(Ljava/lang/String;Z)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setVerboseLoggingEnabled(Z)V,sdk,system-api,test-api
@@ -3707,6 +4425,7 @@
 Landroid/net/wifi/WifiManager;->setWifiApConfiguration(Landroid/net/wifi/WifiConfiguration;)Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setWifiConnectedNetworkScorer(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorer;)Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setWifiEnabled(Z)Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->setWifiPasspointEnabled(Z)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->setWifiScoringEnabled(Z)Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->startEasyConnectAsConfiguratorInitiator(Ljava/lang/String;IILjava/util/concurrent/Executor;Landroid/net/wifi/EasyConnectStatusCallback;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->startEasyConnectAsEnrolleeInitiator(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/wifi/EasyConnectStatusCallback;)V,sdk,system-api,test-api
@@ -3725,8 +4444,10 @@
 Landroid/net/wifi/WifiManager;->stopLocalOnlyHotspot()V,lo-prio,max-target-o
 Landroid/net/wifi/WifiManager;->stopRestrictingAutoJoinToSubscriptionId()V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->stopSoftAp()Z,sdk,system-api,test-api
+Landroid/net/wifi/WifiManager;->unregisterActiveCountryCodeChangedCallback(Landroid/net/wifi/WifiManager$ActiveCountryCodeChangedCallback;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->unregisterCoexCallback(Landroid/net/wifi/WifiManager$CoexCallback;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->unregisterLocalOnlyHotspotObserver()V,lo-prio,max-target-o
+Landroid/net/wifi/WifiManager;->unregisterLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/WifiManager$SoftApCallback;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->unregisterNetworkRequestMatchCallback(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->unregisterScanResultsCallback(Landroid/net/wifi/WifiManager$ScanResultsCallback;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiManager;->unregisterSoftApCallback(Landroid/net/wifi/WifiManager$SoftApCallback;)V,sdk,system-api,test-api
@@ -3864,6 +4585,7 @@
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsInitialAutojoinEnabled:Z,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsNetworkOemPaid:Z,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsNetworkOemPrivate:Z,blocked
+Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsNetworkRestricted:Z,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsNetworkUntrusted:Z,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsSharedWithUser:Z,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsSharedWithUserSet:Z,blocked
@@ -3874,10 +4596,11 @@
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mPriority:I,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mPriorityGroup:I,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mSaeH2eOnlyMode:Z,blocked
-Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mSsid:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mSubscriptionGroup:Landroid/os/ParcelUuid;,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mSubscriptionId:I,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mWapiEnterpriseConfig:Landroid/net/wifi/WifiEnterpriseConfig;,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mWapiPskPassphrase:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mWifiSsid:Landroid/net/wifi/WifiSsid;,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mWpa2EnterpriseConfig:Landroid/net/wifi/WifiEnterpriseConfig;,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mWpa2PskPassphrase:Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mWpa3EnterpriseConfig:Landroid/net/wifi/WifiEnterpriseConfig;,blocked
@@ -3900,12 +4623,15 @@
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setPasspointConfig(Landroid/net/wifi/hotspot2/PasspointConfiguration;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setPriority(I)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setPriorityGroup(I)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setRestricted(Z)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setSecurityParamsInWifiConfiguration(Landroid/net/wifi/WifiConfiguration;)V,blocked
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setSsid(Ljava/lang/String;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setSubscriptionGroup(Landroid/os/ParcelUuid;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setSubscriptionId(I)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setUntrusted(Z)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setWapiEnterpriseConfig(Landroid/net/wifi/WifiEnterpriseConfig;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setWapiPassphrase(Ljava/lang/String;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setWifiSsid(Landroid/net/wifi/WifiSsid;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setWpa2EnterpriseConfig(Landroid/net/wifi/WifiEnterpriseConfig;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setWpa2Passphrase(Ljava/lang/String;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setWpa3Enterprise192BitModeConfig(Landroid/net/wifi/WifiEnterpriseConfig;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,sdk,system-api,test-api
@@ -3924,13 +4650,16 @@
 Landroid/net/wifi/WifiNetworkSuggestion;->getBssid()Landroid/net/MacAddress;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getCarrierId()I,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getEnterpriseConfig()Landroid/net/wifi/WifiEnterpriseConfig;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion;->getMacRandomizationSetting()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getPassphrase()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getPasspointConfig()Landroid/net/wifi/hotspot2/PasspointConfiguration;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getPriority()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getPriorityGroup()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getSsid()Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion;->getSubscriptionGroup()Landroid/os/ParcelUuid;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getSubscriptionId()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getWifiConfiguration()Landroid/net/wifi/WifiConfiguration;,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion;->getWifiSsid()Landroid/net/wifi/WifiSsid;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->isAppInteractionRequired()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->isAppInteractionRequired:Z,blocked
@@ -3943,6 +4672,7 @@
 Landroid/net/wifi/WifiNetworkSuggestion;->isMetered()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->isOemPaid()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->isOemPrivate()Z,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion;->isRestricted()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->isUntrusted()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->isUserAllowedToManuallyConnect:Z,blocked
 Landroid/net/wifi/WifiNetworkSuggestion;->isUserInteractionRequired()Z,public-api,sdk,system-api,test-api
@@ -4086,11 +4816,11 @@
 Landroid/net/wifi/WifiScanner$ScanSettings$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner$ScanSettings$HiddenNetwork;-><init>(Ljava/lang/String;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner$ScanSettings$HiddenNetwork;->ssid:Ljava/lang/String;,sdk,system-api,test-api
+Landroid/net/wifi/WifiScanner$ScanSettings;->-$$Nest$fputmEnable6GhzPsc(Landroid/net/wifi/WifiScanner$ScanSettings;Z)V,blocked
+Landroid/net/wifi/WifiScanner$ScanSettings;->-$$Nest$fputmRnrSetting(Landroid/net/wifi/WifiScanner$ScanSettings;I)V,blocked
 Landroid/net/wifi/WifiScanner$ScanSettings;-><clinit>()V,blocked
 Landroid/net/wifi/WifiScanner$ScanSettings;-><init>()V,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner$ScanSettings;->CREATOR:Landroid/os/Parcelable$Creator;,lo-prio,max-target-o
-Landroid/net/wifi/WifiScanner$ScanSettings;->access$002(Landroid/net/wifi/WifiScanner$ScanSettings;I)I,blocked
-Landroid/net/wifi/WifiScanner$ScanSettings;->access$102(Landroid/net/wifi/WifiScanner$ScanSettings;Z)Z,blocked
 Landroid/net/wifi/WifiScanner$ScanSettings;->band:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner$ScanSettings;->channels:[Landroid/net/wifi/WifiScanner$ChannelSpec;,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner$ScanSettings;->describeContents()I,public-api,sdk,system-api,test-api
@@ -4119,17 +4849,17 @@
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiScanner$ActionListener;,blocked
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/WifiScanner$OperationResult;,blocked
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiScanner$PnoScanListener;Landroid/net/wifi/WifiScanner$ParcelableScanResults;)V,blocked
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiScanner$PnoScanListener;,blocked
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/WifiScanner$ParcelableScanResults;,blocked
+Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiScanner$ScanListener;Landroid/net/wifi/WifiScanner$ParcelableScanData;)V,blocked
+Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiScanner$ScanListener;,blocked
+Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/WifiScanner$ParcelableScanData;,blocked
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiScanner$ScanListener;Landroid/net/wifi/ScanResult;)V,blocked
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda3;->f$0:Landroid/net/wifi/WifiScanner$ScanListener;,blocked
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda3;->f$1:Landroid/net/wifi/ScanResult;,blocked
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiScanner$ScanListener;Landroid/net/wifi/WifiScanner$ParcelableScanData;)V,blocked
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;->f$0:Landroid/net/wifi/WifiScanner$ScanListener;,blocked
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;->f$1:Landroid/net/wifi/WifiScanner$ParcelableScanData;,blocked
+Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiScanner$PnoScanListener;Landroid/net/wifi/WifiScanner$ParcelableScanResults;)V,blocked
+Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;->f$0:Landroid/net/wifi/WifiScanner$PnoScanListener;,blocked
+Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;->f$1:Landroid/net/wifi/WifiScanner$ParcelableScanResults;,blocked
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner$ServiceHandler;-><init>(Landroid/net/wifi/WifiScanner;Landroid/os/Looper;)V,blocked
 Landroid/net/wifi/WifiScanner$ServiceHandler;->handleMessage(Landroid/os/Message;)V,public-api,sdk,system-api,test-api
@@ -4156,6 +4886,10 @@
 Landroid/net/wifi/WifiScanner$WifiChangeSettings;->rssiSampleSize:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner$WifiChangeSettings;->unchangedSampleSize:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner$WifiChangeSettings;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiScanner;->-$$Nest$fgetmAsyncChannel(Landroid/net/wifi/WifiScanner;)Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;,blocked
+Landroid/net/wifi/WifiScanner;->-$$Nest$fputmAsyncChannel(Landroid/net/wifi/WifiScanner;Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;)V,blocked
+Landroid/net/wifi/WifiScanner;->-$$Nest$mgetListenerWithExecutor(Landroid/net/wifi/WifiScanner;I)Landroid/net/wifi/WifiScanner$ListenerWithExecutor;,blocked
+Landroid/net/wifi/WifiScanner;->-$$Nest$mremoveListener(Landroid/net/wifi/WifiScanner;I)Ljava/lang/Object;,blocked
 Landroid/net/wifi/WifiScanner;-><init>(Landroid/content/Context;Landroid/net/wifi/IWifiScanner;Landroid/os/Looper;)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiScanner;->BASE:I,lo-prio,max-target-o
 Landroid/net/wifi/WifiScanner;->CMD_DEREGISTER_SCAN_LISTENER:I,lo-prio,max-target-o
@@ -4200,6 +4934,7 @@
 Landroid/net/wifi/WifiScanner;->SCAN_TYPE_HIGH_ACCURACY:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner;->SCAN_TYPE_LOW_LATENCY:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner;->SCAN_TYPE_LOW_POWER:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiScanner;->SCAN_TYPE_MAX:I,blocked
 Landroid/net/wifi/WifiScanner;->TAG:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/WifiScanner;->WIFI_BAND_24_5_6_60_GHZ:I,blocked
 Landroid/net/wifi/WifiScanner;->WIFI_BAND_24_5_6_GHZ:I,sdk,system-api,test-api
@@ -4225,19 +4960,18 @@
 Landroid/net/wifi/WifiScanner;->WIFI_RNR_ENABLED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner;->WIFI_RNR_ENABLED_IF_WIFI_BAND_6_GHZ_SCANNED:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner;->WIFI_RNR_NOT_NEEDED:I,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner;->access$202(Landroid/net/wifi/WifiScanner;Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;)Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;,blocked
-Landroid/net/wifi/WifiScanner;->access$300(Landroid/net/wifi/WifiScanner;I)Landroid/net/wifi/WifiScanner$ListenerWithExecutor;,blocked
-Landroid/net/wifi/WifiScanner;->access$400(Landroid/net/wifi/WifiScanner;I)Ljava/lang/Object;,blocked
 Landroid/net/wifi/WifiScanner;->addListener(Landroid/net/wifi/WifiScanner$ActionListener;)I,lo-prio,max-target-o
 Landroid/net/wifi/WifiScanner;->addListener(Landroid/net/wifi/WifiScanner$ActionListener;Ljava/util/concurrent/Executor;)I,blocked
 Landroid/net/wifi/WifiScanner;->configureWifiChange(IIIII[Landroid/net/wifi/WifiScanner$BssidInfo;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner;->configureWifiChange(Landroid/net/wifi/WifiScanner$WifiChangeSettings;)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner;->getAvailableChannels(I)Ljava/util/List;,sdk,system-api,test-api
+Landroid/net/wifi/WifiScanner;->getInternalHandler()Landroid/os/Handler;,blocked
 Landroid/net/wifi/WifiScanner;->getListenerKey(Ljava/lang/Object;)I,lo-prio,max-target-o
 Landroid/net/wifi/WifiScanner;->getListenerWithExecutor(I)Landroid/net/wifi/WifiScanner$ListenerWithExecutor;,blocked
 Landroid/net/wifi/WifiScanner;->getScanResults()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner;->getSingleScanResults()Ljava/util/List;,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner;->isFullBandScan(IZ)Z,blocked
+Landroid/net/wifi/WifiScanner;->isScanning()Z,sdk,system-api,test-api
 Landroid/net/wifi/WifiScanner;->mAsyncChannel:Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;,blocked
 Landroid/net/wifi/WifiScanner;->mContext:Landroid/content/Context;,lo-prio,max-target-o
 Landroid/net/wifi/WifiScanner;->mExecutorMap:Landroid/util/SparseArray;,blocked
@@ -4275,26 +5009,38 @@
 Landroid/net/wifi/WifiSsid$1;->newArray(I)[Landroid/net/wifi/WifiSsid;,blocked
 Landroid/net/wifi/WifiSsid$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiSsid;-><clinit>()V,blocked
-Landroid/net/wifi/WifiSsid;-><init>()V,lo-prio,max-target-o
-Landroid/net/wifi/WifiSsid;-><init>(Landroid/net/wifi/WifiSsid$1;)V,blocked
-Landroid/net/wifi/WifiSsid;->CREATOR:Landroid/os/Parcelable$Creator;,unsupported
-Landroid/net/wifi/WifiSsid;->HEX_RADIX:I,lo-prio,max-target-o
+Landroid/net/wifi/WifiSsid;-><init>([B)V,blocked
+Landroid/net/wifi/WifiSsid;-><init>([BLandroid/net/wifi/WifiSsid-IA;)V,blocked
+Landroid/net/wifi/WifiSsid;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;,unsupported
-Landroid/net/wifi/WifiSsid;->TAG:Ljava/lang/String;,lo-prio,max-target-o
-Landroid/net/wifi/WifiSsid;->convertToBytes(Ljava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/WifiSsid;->createFromAsciiEncoded(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;,unsupported
-Landroid/net/wifi/WifiSsid;->createFromByteArray([B)Landroid/net/wifi/WifiSsid;,lo-prio,max-target-o
-Landroid/net/wifi/WifiSsid;->createFromHex(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;,lo-prio,max-target-o
+Landroid/net/wifi/WifiSsid;->decodeSsid([BLjava/nio/charset/Charset;)Ljava/lang/String;,blocked
 Landroid/net/wifi/WifiSsid;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiSsid;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiSsid;->getHexString()Ljava/lang/String;,lo-prio,max-target-o
+Landroid/net/wifi/WifiSsid;->fromBytes([B)Landroid/net/wifi/WifiSsid;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiSsid;->fromString(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;,blocked
+Landroid/net/wifi/WifiSsid;->fromUtf8Text(Ljava/lang/CharSequence;)Landroid/net/wifi/WifiSsid;,blocked
+Landroid/net/wifi/WifiSsid;->getBytes()[B,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiSsid;->getOctets()[B,unsupported
+Landroid/net/wifi/WifiSsid;->getUtf8Text()Ljava/lang/CharSequence;,blocked
 Landroid/net/wifi/WifiSsid;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiSsid;->isArrayAllZeroes([B)Z,lo-prio,max-target-o
-Landroid/net/wifi/WifiSsid;->isHidden()Z,lo-prio,max-target-o
+Landroid/net/wifi/WifiSsid;->mBytes:[B,blocked
 Landroid/net/wifi/WifiSsid;->octets:Ljava/io/ByteArrayOutputStream;,unsupported
 Landroid/net/wifi/WifiSsid;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiSsid;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiStringResourceWrapper;-><init>(Landroid/net/wifi/WifiContext;II)V,blocked
+Landroid/net/wifi/WifiStringResourceWrapper;->CARRIER_ID_RESOURCE_NAME_SUFFIX:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiStringResourceWrapper;->CARRIER_ID_RESOURCE_SEPARATOR:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiStringResourceWrapper;->TAG:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiStringResourceWrapper;->getCarrierOverrideString(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiStringResourceWrapper;->getInt(Ljava/lang/String;I)I,blocked
+Landroid/net/wifi/WifiStringResourceWrapper;->getResourcesForSubId()Landroid/content/res/Resources;,blocked
+Landroid/net/wifi/WifiStringResourceWrapper;->getString(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiStringResourceWrapper;->mCarrierId:I,blocked
+Landroid/net/wifi/WifiStringResourceWrapper;->mCarrierIdPrefix:Ljava/lang/String;,blocked
+Landroid/net/wifi/WifiStringResourceWrapper;->mContext:Landroid/net/wifi/WifiContext;,blocked
+Landroid/net/wifi/WifiStringResourceWrapper;->mResources:Landroid/content/res/Resources;,blocked
+Landroid/net/wifi/WifiStringResourceWrapper;->mSubId:I,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$1;-><init>()V,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/WifiUsabilityStatsEntry;,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -4305,14 +5051,14 @@
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats$1;->newArray(I)[Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->-$$Nest$fputmContentionNumSamples(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->-$$Nest$fputmContentionTimeAvgMicros(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->-$$Nest$fputmContentionTimeMaxMicros(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->-$$Nest$fputmContentionTimeMinMicros(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)V,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;-><clinit>()V,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;-><init>()V,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;-><init>(JJJJ)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
-Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->access$002(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)J,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->access$102(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)J,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->access$202(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)J,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->access$302(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)J,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->getContentionNumSamples()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->getContentionTimeAvgMicros()J,sdk,system-api,test-api
@@ -4328,20 +5074,20 @@
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats$1;->newArray(I)[Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmRadioId(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;I)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalBackgroundScanTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalHotspot2ScanTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalNanScanTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalPnoScanTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalRadioOnTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalRadioRxTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalRadioTxTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalRoamScanTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalScanTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;-><clinit>()V,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;-><init>()V,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;-><init>(IJJJJJJJJJ)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1302(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;I)I,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1402(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1502(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1602(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1702(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1802(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1902(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$2002(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$2102(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$2202(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->getRadioId()J,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->getTotalBackgroundScanTimeMillis()J,sdk,system-api,test-api
@@ -4369,19 +5115,19 @@
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats$1;->newArray(I)[Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmBitRateInKbps(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmBw(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmMpduLost(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmNss(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmPreamble(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmRateMcsIdx(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmRetries(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmRxMpdu(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V,blocked
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmTxMpdu(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;-><clinit>()V,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;-><init>()V,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;-><init>(IIIIIIIII)V,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$1002(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$1102(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$1202(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$402(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$502(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$602(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$702(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$802(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I,blocked
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$902(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I,blocked
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->getBandwidthInMhz()I,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->getBitRateInKbps()I,sdk,system-api,test-api
@@ -4414,12 +5160,14 @@
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_10_MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_160_MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_20_MHZ:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_320_MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_40_MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_5_MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_80P80_MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_80_MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_INVALID:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_PREAMBLE_CCK:I,sdk,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_PREAMBLE_EHT:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_PREAMBLE_HE:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_PREAMBLE_HT:I,sdk,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_PREAMBLE_INVALID:I,sdk,system-api,test-api
@@ -4529,6 +5277,42 @@
 Landroid/net/wifi/aware/AttachCallback;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/AttachCallback;->onAttachFailed()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/AttachCallback;->onAttached(Landroid/net/wifi/aware/WifiAwareSession;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/AttachCallback;->onAwareSessionTerminated()V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams$1;-><init>()V,blocked
+Landroid/net/wifi/aware/AwareParams$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/AwareParams;,blocked
+Landroid/net/wifi/aware/AwareParams$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams$1;->newArray(I)[Landroid/net/wifi/aware/AwareParams;,blocked
+Landroid/net/wifi/aware/AwareParams$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;-><clinit>()V,blocked
+Landroid/net/wifi/aware/AwareParams;-><init>()V,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;-><init>(Landroid/os/Parcel;)V,blocked
+Landroid/net/wifi/aware/AwareParams;-><init>(Landroid/os/Parcel;Landroid/net/wifi/aware/AwareParams-IA;)V,blocked
+Landroid/net/wifi/aware/AwareParams;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->UNSET_PARAMETER:I,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->getDiscoveryBeaconIntervalMillis()I,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->getDiscoveryWindowWakeInterval24Ghz()I,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->getDiscoveryWindowWakeInterval5Ghz()I,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->getDiscoveryWindowWakeInterval6Ghz()I,blocked
+Landroid/net/wifi/aware/AwareParams;->getMacRandomizationIntervalSeconds()I,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->getNumSpatialStreamsInDiscovery()I,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->isDwEarlyTerminationEnabled()Z,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->mDiscoveryBeaconIntervalMs:I,blocked
+Landroid/net/wifi/aware/AwareParams;->mDw24Ghz:I,blocked
+Landroid/net/wifi/aware/AwareParams;->mDw5Ghz:I,blocked
+Landroid/net/wifi/aware/AwareParams;->mDw6Ghz:I,blocked
+Landroid/net/wifi/aware/AwareParams;->mIsDwEarlyTerminationEnabled:Z,blocked
+Landroid/net/wifi/aware/AwareParams;->mMacRandomIntervalSec:I,blocked
+Landroid/net/wifi/aware/AwareParams;->mNumSpatialStreamsInDiscovery:I,blocked
+Landroid/net/wifi/aware/AwareParams;->setDiscoveryBeaconIntervalMillis(I)V,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->setDiscoveryWindow6Ghz(I)V,blocked
+Landroid/net/wifi/aware/AwareParams;->setDiscoveryWindowWakeInterval24Ghz(I)V,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->setDiscoveryWindowWakeInterval5Ghz(I)V,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->setDwEarlyTerminationEnabled(Z)V,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->setMacRandomizationIntervalSeconds(I)V,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->setNumSpatialStreamsInDiscovery(I)V,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/AwareResources$1;-><init>()V,blocked
 Landroid/net/wifi/aware/AwareResources$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/AwareResources;,blocked
 Landroid/net/wifi/aware/AwareResources$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -4558,15 +5342,26 @@
 Landroid/net/wifi/aware/Characteristics;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->KEY_IS_INSTANT_COMMUNICATION_MODE_SUPPORTED:Ljava/lang/String;,blocked
 Landroid/net/wifi/aware/Characteristics;->KEY_MAX_MATCH_FILTER_LENGTH:Ljava/lang/String;,lo-prio,max-target-o
+Landroid/net/wifi/aware/Characteristics;->KEY_MAX_NDI_NUMBER:Ljava/lang/String;,blocked
+Landroid/net/wifi/aware/Characteristics;->KEY_MAX_NDP_NUMBER:Ljava/lang/String;,blocked
+Landroid/net/wifi/aware/Characteristics;->KEY_MAX_PUBLISH_NUMBER:Ljava/lang/String;,blocked
 Landroid/net/wifi/aware/Characteristics;->KEY_MAX_SERVICE_NAME_LENGTH:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/aware/Characteristics;->KEY_MAX_SERVICE_SPECIFIC_INFO_LENGTH:Ljava/lang/String;,lo-prio,max-target-o
+Landroid/net/wifi/aware/Characteristics;->KEY_MAX_SUBSCRIBE_NUMBER:Ljava/lang/String;,blocked
 Landroid/net/wifi/aware/Characteristics;->KEY_SUPPORTED_CIPHER_SUITES:Ljava/lang/String;,blocked
+Landroid/net/wifi/aware/Characteristics;->WIFI_AWARE_CIPHER_SUITE_NCS_PK_128:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/Characteristics;->WIFI_AWARE_CIPHER_SUITE_NCS_PK_256:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->WIFI_AWARE_CIPHER_SUITE_NCS_SK_128:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->WIFI_AWARE_CIPHER_SUITE_NCS_SK_256:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/Characteristics;->WIFI_AWARE_CIPHER_SUITE_NONE:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->getMaxMatchFilterLength()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->getMaxServiceNameLength()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->getMaxServiceSpecificInfoLength()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/Characteristics;->getNumberOfSupportedDataInterfaces()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/Characteristics;->getNumberOfSupportedDataPaths()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/Characteristics;->getNumberOfSupportedPublishSessions()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/Characteristics;->getNumberOfSupportedSubscribeSessions()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->getSupportedCipherSuites()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->isInstantCommunicationModeSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->mCharacteristics:Landroid/os/Bundle;,lo-prio,max-target-o
@@ -4592,7 +5387,7 @@
 Landroid/net/wifi/aware/ConfigRequest$Builder;->setSupport6gBand(Z)Landroid/net/wifi/aware/ConfigRequest$Builder;,blocked
 Landroid/net/wifi/aware/ConfigRequest;-><clinit>()V,blocked
 Landroid/net/wifi/aware/ConfigRequest;-><init>(ZZIII[I)V,blocked
-Landroid/net/wifi/aware/ConfigRequest;-><init>(ZZIII[ILandroid/net/wifi/aware/ConfigRequest$1;)V,blocked
+Landroid/net/wifi/aware/ConfigRequest;-><init>(ZZIII[ILandroid/net/wifi/aware/ConfigRequest-IA;)V,blocked
 Landroid/net/wifi/aware/ConfigRequest;->CLUSTER_ID_MAX:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/ConfigRequest;->CLUSTER_ID_MIN:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/ConfigRequest;->CREATOR:Landroid/os/Parcelable$Creator;,lo-prio,max-target-o
@@ -4640,7 +5435,9 @@
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onMessageSendSucceeded(I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onPublishStarted(Landroid/net/wifi/aware/PublishDiscoverySession;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onServiceDiscovered(Landroid/net/wifi/aware/PeerHandle;[BLjava/util/List;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/DiscoverySessionCallback;->onServiceDiscovered(Landroid/net/wifi/aware/ServiceDiscoveryInfo;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onServiceDiscoveredWithinRange(Landroid/net/wifi/aware/PeerHandle;[BLjava/util/List;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/DiscoverySessionCallback;->onServiceDiscoveredWithinRange(Landroid/net/wifi/aware/ServiceDiscoveryInfo;I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onServiceLost(Landroid/net/wifi/aware/PeerHandle;I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onSessionConfigFailed()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onSessionConfigUpdated()V,public-api,sdk,system-api,test-api
@@ -4648,9 +5445,9 @@
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onSubscribeStarted(Landroid/net/wifi/aware/SubscribeDiscoverySession;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;-><init>()V,blocked
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMatch(I[B[B)V,blocked
+Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMatch(I[B[BI[B)V,blocked
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMatchExpired(I)V,blocked
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMatchWithDistance(I[B[BI)V,blocked
+Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMatchWithDistance(I[B[BII[B)V,blocked
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMessageReceived(I[B)V,blocked
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMessageSendFail(II)V,blocked
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMessageSendSuccess(I)V,blocked
@@ -4662,9 +5459,9 @@
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMatch(I[B[B)V,lo-prio,max-target-o
+Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMatch(I[B[BI[B)V,blocked
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMatchExpired(I)V,blocked
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMatchWithDistance(I[B[BI)V,lo-prio,max-target-o
+Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMatchWithDistance(I[B[BII[B)V,blocked
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMessageReceived(I[B)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMessageSendFail(II)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMessageSendSuccess(I)V,lo-prio,max-target-o
@@ -4672,7 +5469,6 @@
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onSessionConfigSuccess()V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onSessionStarted(I)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onSessionTerminated(I)V,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;,blocked
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->TRANSACTION_onMatch:I,lo-prio,max-target-o
@@ -4687,12 +5483,10 @@
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->TRANSACTION_onSessionTerminated:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->getDefaultImpl()Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;,blocked
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->setDefaultImpl(Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)Z,blocked
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMatch(I[B[B)V,lo-prio,max-target-o
+Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMatch(I[B[BI[B)V,blocked
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMatchExpired(I)V,blocked
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMatchWithDistance(I[B[BI)V,lo-prio,max-target-o
+Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMatchWithDistance(I[B[BII[B)V,blocked
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMessageReceived(I[B)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMessageSendFail(II)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMessageSendSuccess(I)V,lo-prio,max-target-o
@@ -4702,6 +5496,7 @@
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onSessionTerminated(I)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Default;-><init>()V,blocked
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/IWifiAwareEventCallback$Default;->onAttachTerminate()V,blocked
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Default;->onConnectFail(I)V,blocked
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Default;->onConnectSuccess(I)V,blocked
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Default;->onIdentityChanged([B)V,blocked
@@ -4709,61 +5504,60 @@
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;,lo-prio,max-target-o
+Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->onAttachTerminate()V,blocked
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->onConnectFail(I)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->onConnectSuccess(I)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->onIdentityChanged([B)V,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/aware/IWifiAwareEventCallback;,blocked
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-target-o
+Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->TRANSACTION_onAttachTerminate:I,blocked
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->TRANSACTION_onConnectFail:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->TRANSACTION_onConnectSuccess:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->TRANSACTION_onIdentityChanged:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/aware/IWifiAwareEventCallback;,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->getDefaultImpl()Landroid/net/wifi/aware/IWifiAwareEventCallback;,blocked
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->setDefaultImpl(Landroid/net/wifi/aware/IWifiAwareEventCallback;)Z,blocked
+Landroid/net/wifi/aware/IWifiAwareEventCallback;->onAttachTerminate()V,blocked
 Landroid/net/wifi/aware/IWifiAwareEventCallback;->onConnectFail(I)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareEventCallback;->onConnectSuccess(I)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareEventCallback;->onIdentityChanged([B)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Default;-><init>()V,blocked
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Default;->macAddress(Ljava/util/Map;)V,blocked
+Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Default;->macAddress([Landroid/net/wifi/aware/MacAddrMapping;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->mRemote:Landroid/os/IBinder;,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->macAddress(Ljava/util/Map;)V,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;,blocked
+Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->macAddress([Landroid/net/wifi/aware/MacAddrMapping;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->TRANSACTION_macAddress:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->getDefaultImpl()Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;,blocked
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->setDefaultImpl(Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;)Z,blocked
-Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;->macAddress(Ljava/util/Map;)V,lo-prio,max-target-o
+Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;->macAddress([Landroid/net/wifi/aware/MacAddrMapping;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Default;-><init>()V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareManager$Default;->connect(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;Z)V,blocked
+Landroid/net/wifi/aware/IWifiAwareManager$Default;->connect(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;ZLandroid/os/Bundle;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->disconnect(ILandroid/os/IBinder;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->enableInstantCommunicationMode(Ljava/lang/String;Z)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->getAvailableAwareResources()Landroid/net/wifi/aware/AwareResources;,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->getCharacteristics()Landroid/net/wifi/aware/Characteristics;,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->isDeviceAttached()Z,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->isInstantCommunicationModeEnabled()Z,blocked
+Landroid/net/wifi/aware/IWifiAwareManager$Default;->isSetChannelOnDataPathSupported()Z,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->isUsageEnabled()Z,blocked
-Landroid/net/wifi/aware/IWifiAwareManager$Default;->publish(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V,blocked
-Landroid/net/wifi/aware/IWifiAwareManager$Default;->requestMacAddresses(ILjava/util/List;Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V,blocked
+Landroid/net/wifi/aware/IWifiAwareManager$Default;->publish(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;Landroid/os/Bundle;)V,blocked
+Landroid/net/wifi/aware/IWifiAwareManager$Default;->requestMacAddresses(I[ILandroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->sendMessage(III[BII)V,blocked
-Landroid/net/wifi/aware/IWifiAwareManager$Default;->subscribe(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V,blocked
+Landroid/net/wifi/aware/IWifiAwareManager$Default;->setAwareParams(Landroid/net/wifi/aware/AwareParams;)V,blocked
+Landroid/net/wifi/aware/IWifiAwareManager$Default;->subscribe(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;Landroid/os/Bundle;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->terminateSession(II)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->updatePublish(IILandroid/net/wifi/aware/PublishConfig;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->updateSubscribe(IILandroid/net/wifi/aware/SubscribeConfig;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->connect(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;Z)V,blocked
+Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->connect(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;ZLandroid/os/Bundle;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->disconnect(ILandroid/os/IBinder;)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->enableInstantCommunicationMode(Ljava/lang/String;Z)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->getAvailableAwareResources()Landroid/net/wifi/aware/AwareResources;,blocked
@@ -4771,13 +5565,14 @@
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->isDeviceAttached()Z,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->isInstantCommunicationModeEnabled()Z,blocked
+Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->isSetChannelOnDataPathSupported()Z,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->isUsageEnabled()Z,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->publish(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V,blocked
-Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->requestMacAddresses(ILjava/util/List;Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/aware/IWifiAwareManager;,blocked
+Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->publish(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;Landroid/os/Bundle;)V,blocked
+Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->requestMacAddresses(I[ILandroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->sendMessage(III[BII)V,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->subscribe(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V,blocked
+Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->setAwareParams(Landroid/net/wifi/aware/AwareParams;)V,blocked
+Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->subscribe(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;Landroid/os/Bundle;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->terminateSession(II)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->updatePublish(IILandroid/net/wifi/aware/PublishConfig;)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->updateSubscribe(IILandroid/net/wifi/aware/SubscribeConfig;)V,lo-prio,max-target-o
@@ -4790,36 +5585,51 @@
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_getCharacteristics:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_isDeviceAttached:I,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_isInstantCommunicationModeEnabled:I,blocked
+Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_isSetChannelOnDataPathSupported:I,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_isUsageEnabled:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_publish:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_requestMacAddresses:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_sendMessage:I,lo-prio,max-target-o
+Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_setAwareParams:I,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_subscribe:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_terminateSession:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_updatePublish:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_updateSubscribe:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/aware/IWifiAwareManager;,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareManager$Stub;->getDefaultImpl()Landroid/net/wifi/aware/IWifiAwareManager;,blocked
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareManager$Stub;->setDefaultImpl(Landroid/net/wifi/aware/IWifiAwareManager;)Z,blocked
-Landroid/net/wifi/aware/IWifiAwareManager;->connect(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;Z)V,blocked
+Landroid/net/wifi/aware/IWifiAwareManager;->connect(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;ZLandroid/os/Bundle;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager;->disconnect(ILandroid/os/IBinder;)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager;->enableInstantCommunicationMode(Ljava/lang/String;Z)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager;->getAvailableAwareResources()Landroid/net/wifi/aware/AwareResources;,blocked
 Landroid/net/wifi/aware/IWifiAwareManager;->getCharacteristics()Landroid/net/wifi/aware/Characteristics;,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager;->isDeviceAttached()Z,blocked
 Landroid/net/wifi/aware/IWifiAwareManager;->isInstantCommunicationModeEnabled()Z,blocked
+Landroid/net/wifi/aware/IWifiAwareManager;->isSetChannelOnDataPathSupported()Z,blocked
 Landroid/net/wifi/aware/IWifiAwareManager;->isUsageEnabled()Z,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareManager;->publish(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V,blocked
-Landroid/net/wifi/aware/IWifiAwareManager;->requestMacAddresses(ILjava/util/List;Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V,lo-prio,max-target-o
+Landroid/net/wifi/aware/IWifiAwareManager;->publish(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;Landroid/os/Bundle;)V,blocked
+Landroid/net/wifi/aware/IWifiAwareManager;->requestMacAddresses(I[ILandroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager;->sendMessage(III[BII)V,lo-prio,max-target-o
-Landroid/net/wifi/aware/IWifiAwareManager;->subscribe(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V,blocked
+Landroid/net/wifi/aware/IWifiAwareManager;->setAwareParams(Landroid/net/wifi/aware/AwareParams;)V,blocked
+Landroid/net/wifi/aware/IWifiAwareManager;->subscribe(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;Landroid/os/Bundle;)V,blocked
 Landroid/net/wifi/aware/IWifiAwareManager;->terminateSession(II)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager;->updatePublish(IILandroid/net/wifi/aware/PublishConfig;)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IWifiAwareManager;->updateSubscribe(IILandroid/net/wifi/aware/SubscribeConfig;)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/IdentityChangedListener;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/IdentityChangedListener;->onIdentityChanged([B)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/MacAddrMapping$1;-><init>()V,blocked
+Landroid/net/wifi/aware/MacAddrMapping$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/MacAddrMapping;,blocked
+Landroid/net/wifi/aware/MacAddrMapping$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/MacAddrMapping$1;->newArray(I)[Landroid/net/wifi/aware/MacAddrMapping;,blocked
+Landroid/net/wifi/aware/MacAddrMapping$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/MacAddrMapping;-><clinit>()V,blocked
+Landroid/net/wifi/aware/MacAddrMapping;-><init>()V,blocked
+Landroid/net/wifi/aware/MacAddrMapping;->CREATOR:Landroid/os/Parcelable$Creator;,blocked
+Landroid/net/wifi/aware/MacAddrMapping;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/MacAddrMapping;->macAddress:[B,blocked
+Landroid/net/wifi/aware/MacAddrMapping;->peerId:I,blocked
+Landroid/net/wifi/aware/MacAddrMapping;->readFromParcel(Landroid/os/Parcel;)V,blocked
+Landroid/net/wifi/aware/MacAddrMapping;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/ParcelablePeerHandle$1;-><init>()V,blocked
 Landroid/net/wifi/aware/ParcelablePeerHandle$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/ParcelablePeerHandle;,blocked
 Landroid/net/wifi/aware/ParcelablePeerHandle$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -4841,13 +5651,18 @@
 Landroid/net/wifi/aware/PublishConfig$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig$Builder;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig$Builder;->build()Landroid/net/wifi/aware/PublishConfig;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/PublishConfig$Builder;->mBand:I,blocked
+Landroid/net/wifi/aware/PublishConfig$Builder;->mEnableInstantMode:Z,blocked
 Landroid/net/wifi/aware/PublishConfig$Builder;->mEnableRanging:Z,lo-prio,max-target-o
 Landroid/net/wifi/aware/PublishConfig$Builder;->mEnableTerminateNotification:Z,lo-prio,max-target-o
 Landroid/net/wifi/aware/PublishConfig$Builder;->mMatchFilter:[B,lo-prio,max-target-o
 Landroid/net/wifi/aware/PublishConfig$Builder;->mPublishType:I,lo-prio,max-target-o
+Landroid/net/wifi/aware/PublishConfig$Builder;->mSecurityConfig:Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;,blocked
 Landroid/net/wifi/aware/PublishConfig$Builder;->mServiceName:[B,lo-prio,max-target-o
 Landroid/net/wifi/aware/PublishConfig$Builder;->mServiceSpecificInfo:[B,lo-prio,max-target-o
 Landroid/net/wifi/aware/PublishConfig$Builder;->mTtlSec:I,lo-prio,max-target-o
+Landroid/net/wifi/aware/PublishConfig$Builder;->setDataPathSecurityConfig(Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/PublishConfig$Builder;->setInstantCommunicationModeEnabled(ZI)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig$Builder;->setMatchFilter(Ljava/util/List;)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig$Builder;->setPublishType(I)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig$Builder;->setRangingEnabled(Z)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,sdk,system-api,test-api
@@ -4856,18 +5671,24 @@
 Landroid/net/wifi/aware/PublishConfig$Builder;->setTerminateNotificationEnabled(Z)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig$Builder;->setTtlSec(I)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig;-><clinit>()V,blocked
-Landroid/net/wifi/aware/PublishConfig;-><init>([B[B[BIIZZ)V,lo-prio,max-target-o
+Landroid/net/wifi/aware/PublishConfig;-><init>([B[B[BIIZZZILandroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;)V,blocked
 Landroid/net/wifi/aware/PublishConfig;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig;->PUBLISH_TYPE_SOLICITED:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig;->PUBLISH_TYPE_UNSOLICITED:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig;->assertValid(Landroid/net/wifi/aware/Characteristics;Z)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/PublishConfig;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/PublishConfig;->getInstantCommunicationBand()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/PublishConfig;->getSecurityConfig()Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/PublishConfig;->isInstantCommunicationModeEnabled()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/PublishConfig;->mBand:I,blocked
+Landroid/net/wifi/aware/PublishConfig;->mEnableInstantMode:Z,blocked
 Landroid/net/wifi/aware/PublishConfig;->mEnableRanging:Z,lo-prio,max-target-o
 Landroid/net/wifi/aware/PublishConfig;->mEnableTerminateNotification:Z,lo-prio,max-target-o
 Landroid/net/wifi/aware/PublishConfig;->mMatchFilter:[B,lo-prio,max-target-o
 Landroid/net/wifi/aware/PublishConfig;->mPublishType:I,lo-prio,max-target-o
+Landroid/net/wifi/aware/PublishConfig;->mSecurityConfig:Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;,blocked
 Landroid/net/wifi/aware/PublishConfig;->mServiceName:[B,lo-prio,max-target-o
 Landroid/net/wifi/aware/PublishConfig;->mServiceSpecificInfo:[B,lo-prio,max-target-o
 Landroid/net/wifi/aware/PublishConfig;->mTtlSec:I,lo-prio,max-target-o
@@ -4876,6 +5697,17 @@
 Landroid/net/wifi/aware/PublishDiscoverySession;-><init>(Landroid/net/wifi/aware/WifiAwareManager;II)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/PublishDiscoverySession;->TAG:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/aware/PublishDiscoverySession;->updatePublish(Landroid/net/wifi/aware/PublishConfig;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;-><init>(Landroid/net/wifi/aware/PeerHandle;I[BLjava/util/List;[B)V,blocked
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->getMatchFilters()Ljava/util/List;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->getPeerCipherSuite()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->getPeerHandle()Landroid/net/wifi/aware/PeerHandle;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->getScid()[B,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->getServiceSpecificInfo()[B,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->mMatchFilters:Ljava/util/List;,blocked
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->mPeerCipherSuite:I,blocked
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->mPeerHandle:Landroid/net/wifi/aware/PeerHandle;,blocked
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->mScid:[B,blocked
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->mServiceSpecificInfo:[B,blocked
 Landroid/net/wifi/aware/SubscribeConfig$1;-><init>()V,blocked
 Landroid/net/wifi/aware/SubscribeConfig$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/SubscribeConfig;,blocked
 Landroid/net/wifi/aware/SubscribeConfig$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -4883,6 +5715,8 @@
 Landroid/net/wifi/aware/SubscribeConfig$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig$Builder;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->build()Landroid/net/wifi/aware/SubscribeConfig;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/SubscribeConfig$Builder;->mBand:I,blocked
+Landroid/net/wifi/aware/SubscribeConfig$Builder;->mEnableInstantMode:Z,blocked
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->mEnableTerminateNotification:Z,lo-prio,max-target-o
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->mMatchFilter:[B,lo-prio,max-target-o
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->mMaxDistanceMm:I,lo-prio,max-target-o
@@ -4893,6 +5727,7 @@
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->mServiceSpecificInfo:[B,lo-prio,max-target-o
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->mSubscribeType:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->mTtlSec:I,lo-prio,max-target-o
+Landroid/net/wifi/aware/SubscribeConfig$Builder;->setInstantCommunicationModeEnabled(ZI)Landroid/net/wifi/aware/SubscribeConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->setMatchFilter(Ljava/util/List;)Landroid/net/wifi/aware/SubscribeConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->setMaxDistanceMm(I)Landroid/net/wifi/aware/SubscribeConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->setMinDistanceMm(I)Landroid/net/wifi/aware/SubscribeConfig$Builder;,public-api,sdk,system-api,test-api
@@ -4902,14 +5737,18 @@
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->setTerminateNotificationEnabled(Z)Landroid/net/wifi/aware/SubscribeConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->setTtlSec(I)Landroid/net/wifi/aware/SubscribeConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig;-><clinit>()V,blocked
-Landroid/net/wifi/aware/SubscribeConfig;-><init>([B[B[BIIZZIZI)V,lo-prio,max-target-o
+Landroid/net/wifi/aware/SubscribeConfig;-><init>([B[B[BIIZZIZIZI)V,blocked
 Landroid/net/wifi/aware/SubscribeConfig;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig;->SUBSCRIBE_TYPE_ACTIVE:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig;->SUBSCRIBE_TYPE_PASSIVE:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig;->assertValid(Landroid/net/wifi/aware/Characteristics;Z)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/SubscribeConfig;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/SubscribeConfig;->getInstantCommunicationBand()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/SubscribeConfig;->isInstantCommunicationModeEnabled()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/SubscribeConfig;->mBand:I,blocked
+Landroid/net/wifi/aware/SubscribeConfig;->mEnableInstantMode:Z,blocked
 Landroid/net/wifi/aware/SubscribeConfig;->mEnableTerminateNotification:Z,lo-prio,max-target-o
 Landroid/net/wifi/aware/SubscribeConfig;->mMatchFilter:[B,lo-prio,max-target-o
 Landroid/net/wifi/aware/SubscribeConfig;->mMaxDistanceMm:I,lo-prio,max-target-o
@@ -4950,9 +5789,9 @@
 Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->putZeroLengthElement(I)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;,lo-prio,max-target-o
 Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->setByteOrder(Ljava/nio/ByteOrder;)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;,blocked
 Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->wrap([B)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;,lo-prio,max-target-o
+Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->-$$Nest$fgetmRefArray(Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;)[B,blocked
 Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;-><init>(II[BI)V,lo-prio,max-target-o
-Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;-><init>(II[BILandroid/net/wifi/aware/TlvBufferUtils$1;)V,blocked
-Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->access$400(Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;)[B,blocked
+Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;-><init>(II[BILandroid/net/wifi/aware/TlvBufferUtils$TlvElement-IA;)V,blocked
 Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->byteOrder:Ljava/nio/ByteOrder;,blocked
 Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->getByte()B,lo-prio,max-target-o
 Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->getInt()I,lo-prio,max-target-o
@@ -4970,12 +5809,12 @@
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable$1;->next()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable$1;->remove()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable$1;->this$0:Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;,blocked
+Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->-$$Nest$fgetmArray(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)[B,blocked
+Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->-$$Nest$fgetmArrayLength(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)I,blocked
+Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->-$$Nest$fgetmByteOrder(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)Ljava/nio/ByteOrder;,blocked
+Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->-$$Nest$fgetmLengthSize(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)I,blocked
+Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->-$$Nest$fgetmTypeSize(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)I,blocked
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;-><init>(II[B)V,lo-prio,max-target-o
-Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->access$500(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)I,blocked
-Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->access$600(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)I,blocked
-Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->access$700(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)[B,blocked
-Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->access$800(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)Ljava/nio/ByteOrder;,blocked
-Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->access$900(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)I,blocked
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->iterator()Ljava/util/Iterator;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->mArray:[B,lo-prio,max-target-o
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->mArrayLength:I,lo-prio,max-target-o
@@ -4985,11 +5824,11 @@
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->setByteOrder(Ljava/nio/ByteOrder;)V,blocked
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->toList()Ljava/util/List;,lo-prio,max-target-o
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/TlvBufferUtils;->-$$Nest$smpeekInt([BILjava/nio/ByteOrder;)I,blocked
+Landroid/net/wifi/aware/TlvBufferUtils;->-$$Nest$smpeekShort([BILjava/nio/ByteOrder;)S,blocked
+Landroid/net/wifi/aware/TlvBufferUtils;->-$$Nest$smpokeInt([BIILjava/nio/ByteOrder;)V,blocked
+Landroid/net/wifi/aware/TlvBufferUtils;->-$$Nest$smpokeShort([BISLjava/nio/ByteOrder;)V,blocked
 Landroid/net/wifi/aware/TlvBufferUtils;-><init>()V,lo-prio,max-target-o
-Landroid/net/wifi/aware/TlvBufferUtils;->access$000([BISLjava/nio/ByteOrder;)V,blocked
-Landroid/net/wifi/aware/TlvBufferUtils;->access$100([BIILjava/nio/ByteOrder;)V,blocked
-Landroid/net/wifi/aware/TlvBufferUtils;->access$200([BILjava/nio/ByteOrder;)S,blocked
-Landroid/net/wifi/aware/TlvBufferUtils;->access$300([BILjava/nio/ByteOrder;)I,blocked
 Landroid/net/wifi/aware/TlvBufferUtils;->isValid([BII)Z,lo-prio,max-target-o
 Landroid/net/wifi/aware/TlvBufferUtils;->isValidEndian([BIILjava/nio/ByteOrder;)Z,blocked
 Landroid/net/wifi/aware/TlvBufferUtils;->peekInt([BILjava/nio/ByteOrder;)I,blocked
@@ -5015,6 +5854,7 @@
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier$ByteArrayWrapper;->mData:[B,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier$ByteArrayWrapper;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier$ByteArrayWrapper;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->-$$Nest$fgetmNetworkSpecifiers(Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;)Ljava/util/Set;,blocked
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;-><clinit>()V,blocked
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;-><init>(Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;)V,lo-prio,max-target-o
@@ -5022,7 +5862,6 @@
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->CREATOR:Landroid/os/Parcelable$Creator;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->TAG:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->VDBG:Z,lo-prio,max-target-o
-Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->access$000(Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;)Ljava/util/Set;,blocked
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->canBeSatisfiedBy(Landroid/net/NetworkSpecifier;)Z,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->convert(Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;)Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier$ByteArrayWrapper;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->describeContents()I,public-api,sdk,system-api,test-api
@@ -5036,9 +5875,66 @@
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->satisfiesAwareNetworkSpecifier(Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;)Z,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo$1;-><init>()V,blocked
+Landroid/net/wifi/aware/WifiAwareChannelInfo$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/WifiAwareChannelInfo;,blocked
+Landroid/net/wifi/aware/WifiAwareChannelInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo$1;->newArray(I)[Landroid/net/wifi/aware/WifiAwareChannelInfo;,blocked
+Landroid/net/wifi/aware/WifiAwareChannelInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;-><clinit>()V,blocked
+Landroid/net/wifi/aware/WifiAwareChannelInfo;-><init>(III)V,blocked
+Landroid/net/wifi/aware/WifiAwareChannelInfo;-><init>(Landroid/os/Parcel;)V,blocked
+Landroid/net/wifi/aware/WifiAwareChannelInfo;-><init>(Landroid/os/Parcel;Landroid/net/wifi/aware/WifiAwareChannelInfo-IA;)V,blocked
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->getChannelBandwidth()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->getChannelFrequencyMhz()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->getSpatialStreamCount()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->mChannelBandwidth:I,blocked
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->mChannelFreq:I,blocked
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->mNumSpatialStreams:I,blocked
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$1;-><init>()V,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$1;->newArray(I)[Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;-><init>(I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->build()Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->mCipherSuite:I,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->mPassphrase:Ljava/lang/String;,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->mPmk:[B,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->mPmkId:[B,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->setPmk([B)Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->setPmkId([B)Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->setPskPassphrase(Ljava/lang/String;)Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;-><clinit>()V,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;-><init>(I[B[BLjava/lang/String;)V,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;-><init>(Landroid/os/Parcel;)V,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;-><init>(Landroid/os/Parcel;Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig-IA;)V,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->getCipherSuite()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->getPmk()[B,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->getPmkId()[B,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->getPskPassphrase()Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->isValid()Z,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->mCipherSuite:I,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->mPassphrase:Ljava/lang/String;,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->mPmk:[B,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->mPmkId:[B,blocked
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy$1;-><init>(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;Landroid/os/Looper;)V,blocked
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy$1;->handleMessage(Landroid/os/Message;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy$1;->this$0:Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;,blocked
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->-$$Nest$fgetmAwareManager(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;)Ljava/lang/ref/WeakReference;,blocked
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->-$$Nest$fgetmOriginalCallback(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;)Landroid/net/wifi/aware/DiscoverySessionCallback;,blocked
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->-$$Nest$fgetmSession(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;)Landroid/net/wifi/aware/DiscoverySession;,blocked
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;-><init>(Landroid/net/wifi/aware/WifiAwareManager;Landroid/os/Looper;ZLandroid/net/wifi/aware/DiscoverySessionCallback;I)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_MATCH:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_MATCH_EXPIRED:I,blocked
@@ -5050,21 +5946,20 @@
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_SESSION_CONFIG_SUCCESS:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_SESSION_STARTED:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_SESSION_TERMINATED:I,lo-prio,max-target-o
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->MESSAGE_BUNDLE_KEY_CIPHER_SUITE:Ljava/lang/String;,blocked
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->MESSAGE_BUNDLE_KEY_MESSAGE2:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->MESSAGE_BUNDLE_KEY_MESSAGE:Ljava/lang/String;,lo-prio,max-target-o
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->access$200(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;)Ljava/lang/ref/WeakReference;,blocked
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->access$300(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;)Landroid/net/wifi/aware/DiscoverySessionCallback;,blocked
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->access$400(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;)Landroid/net/wifi/aware/DiscoverySession;,blocked
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->MESSAGE_BUNDLE_KEY_SCID:Ljava/lang/String;,blocked
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mAwareManager:Ljava/lang/ref/WeakReference;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mClientId:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mHandler:Landroid/os/Handler;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mIsPublish:Z,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mOriginalCallback:Landroid/net/wifi/aware/DiscoverySessionCallback;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mSession:Landroid/net/wifi/aware/DiscoverySession;,lo-prio,max-target-o
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatch(I[B[B)V,lo-prio,max-target-o
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatchCommon(II[B[BI)V,lo-prio,max-target-o
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatch(I[B[BI[B)V,blocked
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatchCommon(II[B[BII[B)V,blocked
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatchExpired(I)V,blocked
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatchWithDistance(I[B[BI)V,lo-prio,max-target-o
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatchWithDistance(I[B[BII[B)V,blocked
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMessageReceived(I[B)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMessageSendFail(II)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMessageSendSuccess(I)V,lo-prio,max-target-o
@@ -5079,22 +5974,26 @@
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy$1;->this$0:Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;,blocked
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy$1;->val$attachCallback:Landroid/net/wifi/aware/AttachCallback;,blocked
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy$1;->val$identityChangedListener:Landroid/net/wifi/aware/IdentityChangedListener;,blocked
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->-$$Nest$fgetmAwareManager(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;)Ljava/lang/ref/WeakReference;,blocked
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->-$$Nest$fgetmBinder(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;)Landroid/os/Binder;,blocked
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;-><init>(Landroid/net/wifi/aware/WifiAwareManager;Landroid/os/Looper;Landroid/os/Binder;Landroid/net/wifi/aware/AttachCallback;Landroid/net/wifi/aware/IdentityChangedListener;)V,lo-prio,max-target-o
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->CALLBACK_ATTACH_TERMINATE:I,blocked
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->CALLBACK_CONNECT_FAIL:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->CALLBACK_CONNECT_SUCCESS:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->CALLBACK_IDENTITY_CHANGED:I,lo-prio,max-target-o
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->access$000(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;)Ljava/lang/ref/WeakReference;,blocked
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->access$100(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;)Landroid/os/Binder;,blocked
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->mAwareManager:Ljava/lang/ref/WeakReference;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->mBinder:Landroid/os/Binder;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->mHandler:Landroid/os/Handler;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->mLooper:Landroid/os/Looper;,lo-prio,max-target-o
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->onAttachTerminate()V,blocked
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->onConnectFail(I)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->onConnectSuccess(I)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->onIdentityChanged([B)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager;-><init>(Landroid/content/Context;Landroid/net/wifi/aware/IWifiAwareManager;)V,lo-prio,max-target-o
+Landroid/net/wifi/aware/WifiAwareManager;->ACTION_WIFI_AWARE_RESOURCE_CHANGED:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->ACTION_WIFI_AWARE_STATE_CHANGED:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->DBG:Z,lo-prio,max-target-o
+Landroid/net/wifi/aware/WifiAwareManager;->EXTRA_AWARE_RESOURCES:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->TAG:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager;->VDBG:Z,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager;->WIFI_AWARE_DATA_PATH_ROLE_INITIATOR:I,public-api,sdk,system-api,test-api
@@ -5113,12 +6012,14 @@
 Landroid/net/wifi/aware/WifiAwareManager;->isAvailable()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->isDeviceAttached()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->isInstantCommunicationModeEnabled()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareManager;->isSetChannelOnDataPathSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->mContext:Landroid/content/Context;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager;->mLock:Ljava/lang/Object;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager;->mService:Landroid/net/wifi/aware/IWifiAwareManager;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager;->publish(ILandroid/os/Looper;Landroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/DiscoverySessionCallback;)V,lo-prio,max-target-o
-Landroid/net/wifi/aware/WifiAwareManager;->requestMacAddresses(ILjava/util/List;Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V,blocked
+Landroid/net/wifi/aware/WifiAwareManager;->requestMacAddresses(I[ILandroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V,blocked
 Landroid/net/wifi/aware/WifiAwareManager;->sendMessage(IILandroid/net/wifi/aware/PeerHandle;[BII)V,lo-prio,max-target-o
+Landroid/net/wifi/aware/WifiAwareManager;->setAwareParams(Landroid/net/wifi/aware/AwareParams;)V,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->subscribe(ILandroid/os/Looper;Landroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/DiscoverySessionCallback;)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager;->terminateSession(II)V,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareManager;->updatePublish(IILandroid/net/wifi/aware/PublishConfig;)V,lo-prio,max-target-o
@@ -5132,14 +6033,16 @@
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;-><init>()V,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;-><init>(Landroid/net/wifi/aware/WifiAwareNetworkInfo;)V,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;-><init>(Ljava/net/Inet6Address;)V,blocked
-Landroid/net/wifi/aware/WifiAwareNetworkInfo;-><init>(Ljava/net/Inet6Address;II)V,blocked
+Landroid/net/wifi/aware/WifiAwareNetworkInfo;-><init>(Ljava/net/Inet6Address;IILjava/util/List;)V,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkInfo;->getChannelInfoList()Ljava/util/List;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->getPeerIpv6Addr()Ljava/net/Inet6Address;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->getPort()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->getTransportProtocol()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkInfo;->mChannelInfos:Ljava/util/List;,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->mIpv6Addr:Ljava/net/Inet6Address;,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->mPort:I,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->mTransportProtocol:I,blocked
@@ -5153,17 +6056,23 @@
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;-><init>(Landroid/net/wifi/aware/DiscoverySession;Landroid/net/wifi/aware/PeerHandle;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;-><init>(Landroid/net/wifi/aware/PublishDiscoverySession;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->build()Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mChannel:I,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mDiscoverySession:Landroid/net/wifi/aware/DiscoverySession;,blocked
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mIsRequired:Z,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mPeerHandle:Landroid/net/wifi/aware/PeerHandle;,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mPmk:[B,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mPort:I,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mPskPassphrase:Ljava/lang/String;,blocked
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mSecurityConfig:Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mTransportProtocol:I,blocked
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->setChannelFrequencyMhz(IZ)Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->setDataPathSecurityConfig(Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;)Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->setPmk([B)Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->setPort(I)Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->setPskPassphrase(Ljava/lang/String;)Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->setTransportProtocol(I)Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;-><clinit>()V,blocked
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;-><init>(IIIII[BIIIZLandroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;)V,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;-><init>(IIIII[B[BLjava/lang/String;II)V,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->NETWORK_SPECIFIER_TYPE_IB:I,lo-prio,max-target-o
@@ -5175,8 +6084,14 @@
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->clientId:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->getChannelFrequencyMhz()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->getWifiAwareDataPathSecurityConfig()Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->isChannelRequired()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->isOutOfBand()Z,lo-prio,max-target-o
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->mChannelInMhz:I,blocked
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->mForcedChannel:Z,blocked
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->mSecurityConfig:Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;,blocked
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->passphrase:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->peerId:I,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->peerMac:[B,lo-prio,max-target-o
@@ -5209,14 +6124,15 @@
 Landroid/net/wifi/aware/WifiAwareUtils;->isLegacyVersion(Landroid/content/Context;I)Z,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareUtils;->validatePassphrase(Ljava/lang/String;)Z,lo-prio,max-target-o
 Landroid/net/wifi/aware/WifiAwareUtils;->validatePmk([B)Z,lo-prio,max-target-o
+Landroid/net/wifi/aware/WifiAwareUtils;->validatePmkId([B)Z,blocked
 Landroid/net/wifi/aware/WifiAwareUtils;->validateServiceName([B)V,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;-><init>()V,lo-prio,max-target-o
-Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;-><init>(Landroid/net/wifi/hotspot2/ConfigParser$1;)V,blocked
+Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;-><init>(Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader-IA;)V,blocked
 Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;->boundary:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;->contentType:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;->encodingType:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/ConfigParser$MimePart;-><init>()V,lo-prio,max-target-o
-Landroid/net/wifi/hotspot2/ConfigParser$MimePart;-><init>(Landroid/net/wifi/hotspot2/ConfigParser$1;)V,blocked
+Landroid/net/wifi/hotspot2/ConfigParser$MimePart;-><init>(Landroid/net/wifi/hotspot2/ConfigParser$MimePart-IA;)V,blocked
 Landroid/net/wifi/hotspot2/ConfigParser$MimePart;->data:[B,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/ConfigParser$MimePart;->isLast:Z,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/ConfigParser$MimePart;->type:Ljava/lang/String;,lo-prio,max-target-o
@@ -5252,7 +6168,6 @@
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub$Proxy;->onProvisioningComplete()V,blocked
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub$Proxy;->onProvisioningFailure(I)V,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub$Proxy;->onProvisioningStatus(I)V,lo-prio,max-target-o
-Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/hotspot2/IProvisioningCallback;,blocked
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->TRANSACTION_onProvisioningComplete:I,blocked
@@ -5260,9 +6175,7 @@
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->TRANSACTION_onProvisioningStatus:I,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/hotspot2/IProvisioningCallback;,lo-prio,max-target-o
-Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->getDefaultImpl()Landroid/net/wifi/hotspot2/IProvisioningCallback;,blocked
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->setDefaultImpl(Landroid/net/wifi/hotspot2/IProvisioningCallback;)Z,blocked
 Landroid/net/wifi/hotspot2/IProvisioningCallback;->onProvisioningComplete()V,blocked
 Landroid/net/wifi/hotspot2/IProvisioningCallback;->onProvisioningFailure(I)V,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/IProvisioningCallback;->onProvisioningStatus(I)V,lo-prio,max-target-o
@@ -5303,6 +6216,17 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration$1;->newArray(I)[Landroid/net/wifi/hotspot2/PasspointConfiguration;,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration$1;->readTrustRootCerts(Landroid/os/Parcel;)Ljava/util/Map;,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmCarrierId(Landroid/net/wifi/hotspot2/PasspointConfiguration;I)V,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmDecoratedIdentityPrefix(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)V,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmIsAutojoinEnabled(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)V,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmIsCarrierMerged(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)V,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmIsMacRandomizationEnabled(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)V,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmIsNonPersistentMacRandomizationEnabled(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)V,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmIsOemPaid(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)V,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmIsOemPrivate(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)V,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmMeteredOverride(Landroid/net/wifi/hotspot2/PasspointConfiguration;I)V,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmSubscriptionGroup(Landroid/net/wifi/hotspot2/PasspointConfiguration;Landroid/os/ParcelUuid;)V,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmSubscriptionId(Landroid/net/wifi/hotspot2/PasspointConfiguration;I)V,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;-><clinit>()V,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;-><init>(Landroid/net/wifi/hotspot2/PasspointConfiguration;)V,public-api,sdk,system-api,test-api
@@ -5311,16 +6235,6 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->MAX_URL_BYTES:I,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->NULL_VALUE:I,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->TAG:Ljava/lang/String;,lo-prio,max-target-o
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$002(Landroid/net/wifi/hotspot2/PasspointConfiguration;I)I,blocked
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$102(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)Z,blocked
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$202(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)Z,blocked
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$302(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)Z,blocked
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$402(Landroid/net/wifi/hotspot2/PasspointConfiguration;I)I,blocked
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$502(Landroid/net/wifi/hotspot2/PasspointConfiguration;I)I,blocked
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$602(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)Z,blocked
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$702(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)Z,blocked
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$802(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)Z,blocked
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$902(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)Ljava/lang/String;,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getAaaServerTrustedNames()[Ljava/lang/String;,blocked
@@ -5335,6 +6249,7 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getServiceFriendlyNames()Ljava/util/Map;,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionCreationTimeInMillis()J,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionExpirationTimeMillis()J,public-api,sdk,system-api,test-api
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionGroup()Landroid/os/ParcelUuid;,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionId()I,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionType()Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionUpdate()Landroid/net/wifi/hotspot2/pps/UpdateParameter;,lo-prio,max-target-o
@@ -5348,8 +6263,8 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->isAutojoinEnabled()Z,sdk,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->isCarrierMerged()Z,blocked
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->isEnhancedMacRandomizationEnabled()Z,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->isMacRandomizationEnabled()Z,sdk,system-api,test-api
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->isNonPersistentMacRandomizationEnabled()Z,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->isOemPaid()Z,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->isOemPrivate()Z,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->isOsuProvisioned()Z,public-api,sdk,system-api,test-api
@@ -5362,8 +6277,8 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mHomeSp:Landroid/net/wifi/hotspot2/pps/HomeSp;,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsAutojoinEnabled:Z,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsCarrierMerged:Z,blocked
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsEnhancedMacRandomizationEnabled:Z,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsMacRandomizationEnabled:Z,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsNonPersistentMacRandomizationEnabled:Z,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsOemPaid:Z,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsOemPrivate:Z,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mMeteredOverride:I,blocked
@@ -5371,6 +6286,7 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mServiceFriendlyNames:Ljava/util/Map;,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionCreationTimeInMillis:J,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionExpirationTimeMillis:J,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionGroup:Landroid/os/ParcelUuid;,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionId:I,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionType:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionUpdate:Landroid/net/wifi/hotspot2/pps/UpdateParameter;,lo-prio,max-target-o
@@ -5387,16 +6303,17 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setCredential(Landroid/net/wifi/hotspot2/pps/Credential;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setCredentialPriority(I)V,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setDecoratedIdentityPrefix(Ljava/lang/String;)V,public-api,sdk,system-api,test-api
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->setEnhancedMacRandomizationEnabled(Z)V,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setHomeSp(Landroid/net/wifi/hotspot2/pps/HomeSp;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setMacRandomizationEnabled(Z)V,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setMeteredOverride(I)V,blocked
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->setNonPersistentMacRandomizationEnabled(Z)V,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setOemPaid(Z)V,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setOemPrivate(Z)V,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setPolicy(Landroid/net/wifi/hotspot2/pps/Policy;)V,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setServiceFriendlyNames(Ljava/util/Map;)V,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionCreationTimeInMillis(J)V,lo-prio,max-target-o
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionExpirationTimeInMillis(J)V,lo-prio,max-target-o
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionExpirationTimeInMillis(J)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionGroup(Landroid/os/ParcelUuid;)V,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionId(I)V,blocked
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionType(Ljava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionUpdate(Landroid/net/wifi/hotspot2/pps/UpdateParameter;)V,lo-prio,max-target-o
@@ -5909,7 +6826,7 @@
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->TAG:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_CHECK_INTERVAL_NEVER:J,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_OMADM:Ljava/lang/String;,lo-prio,max-target-o
-Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_SSP:Ljava/lang/String;,lo-prio,max-target-o
+Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_SPP:Ljava/lang/String;,blocked
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_HOMESP:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_ROAMING_PARTNER:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_UNRESTRICTED:Ljava/lang/String;,lo-prio,max-target-o
@@ -5950,18 +6867,19 @@
 Landroid/net/wifi/p2p/IWifiP2pManager$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/IWifiP2pManager$Default;->checkConfigureWifiDisplayPermission()V,blocked
 Landroid/net/wifi/p2p/IWifiP2pManager$Default;->close(Landroid/os/IBinder;)V,blocked
-Landroid/net/wifi/p2p/IWifiP2pManager$Default;->getMessenger(Landroid/os/IBinder;Ljava/lang/String;)Landroid/os/Messenger;,blocked
+Landroid/net/wifi/p2p/IWifiP2pManager$Default;->getMessenger(Landroid/os/IBinder;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Messenger;,blocked
 Landroid/net/wifi/p2p/IWifiP2pManager$Default;->getP2pStateMachineMessenger()Landroid/os/Messenger;,blocked
+Landroid/net/wifi/p2p/IWifiP2pManager$Default;->getSupportedFeatures()J,blocked
 Landroid/net/wifi/p2p/IWifiP2pManager$Default;->setMiracastMode(I)V,blocked
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,lo-prio,max-target-o
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->checkConfigureWifiDisplayPermission()V,lo-prio,max-target-o
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->close(Landroid/os/IBinder;)V,lo-prio,max-target-o
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,lo-prio,max-target-o
-Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->getMessenger(Landroid/os/IBinder;Ljava/lang/String;)Landroid/os/Messenger;,blocked
+Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->getMessenger(Landroid/os/IBinder;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Messenger;,blocked
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->getP2pStateMachineMessenger()Landroid/os/Messenger;,lo-prio,max-target-o
+Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->getSupportedFeatures()J,blocked
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;,lo-prio,max-target-o
-Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/p2p/IWifiP2pManager;,blocked
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->setMiracastMode(I)V,lo-prio,max-target-o
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-target-o
@@ -5969,16 +6887,16 @@
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_close:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_getMessenger:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_getP2pStateMachineMessenger:I,lo-prio,max-target-o
+Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_getSupportedFeatures:I,blocked
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_setMiracastMode:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/p2p/IWifiP2pManager;,lo-prio,max-target-r
-Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->getDefaultImpl()Landroid/net/wifi/p2p/IWifiP2pManager;,blocked
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->setDefaultImpl(Landroid/net/wifi/p2p/IWifiP2pManager;)Z,blocked
 Landroid/net/wifi/p2p/IWifiP2pManager;->checkConfigureWifiDisplayPermission()V,lo-prio,max-target-o
 Landroid/net/wifi/p2p/IWifiP2pManager;->close(Landroid/os/IBinder;)V,lo-prio,max-target-o
-Landroid/net/wifi/p2p/IWifiP2pManager;->getMessenger(Landroid/os/IBinder;Ljava/lang/String;)Landroid/os/Messenger;,blocked
+Landroid/net/wifi/p2p/IWifiP2pManager;->getMessenger(Landroid/os/IBinder;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Messenger;,blocked
 Landroid/net/wifi/p2p/IWifiP2pManager;->getP2pStateMachineMessenger()Landroid/os/Messenger;,lo-prio,max-target-o
+Landroid/net/wifi/p2p/IWifiP2pManager;->getSupportedFeatures()J,blocked
 Landroid/net/wifi/p2p/IWifiP2pManager;->setMiracastMode(I)V,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pConfig$1;-><init>()V,blocked
 Landroid/net/wifi/p2p/WifiP2pConfig$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/p2p/WifiP2pConfig;,blocked
@@ -6033,6 +6951,7 @@
 Landroid/net/wifi/p2p/WifiP2pDevice$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice$1;->newArray(I)[Landroid/net/wifi/p2p/WifiP2pDevice;,blocked
 Landroid/net/wifi/p2p/WifiP2pDevice$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pDevice;->-$$Nest$fputmVendorElements(Landroid/net/wifi/p2p/WifiP2pDevice;Ljava/util/List;)V,blocked
 Landroid/net/wifi/p2p/WifiP2pDevice;-><clinit>()V,blocked
 Landroid/net/wifi/p2p/WifiP2pDevice;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;-><init>(Landroid/net/wifi/p2p/WifiP2pDevice;)V,public-api,sdk,system-api,test-api
@@ -6066,6 +6985,7 @@
 Landroid/net/wifi/p2p/WifiP2pDevice;->deviceCapability:I,unsupported
 Landroid/net/wifi/p2p/WifiP2pDevice;->deviceName:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pDevice;->getVendorElements()Ljava/util/List;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;->getWfdInfo()Landroid/net/wifi/p2p/WifiP2pWfdInfo;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;->groupCapability:I,unsupported
 Landroid/net/wifi/p2p/WifiP2pDevice;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
@@ -6074,9 +6994,11 @@
 Landroid/net/wifi/p2p/WifiP2pDevice;->isGroupOwner()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;->isInvitationCapable()Z,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pDevice;->isServiceDiscoveryCapable()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pDevice;->mVendorElements:Ljava/util/List;,blocked
 Landroid/net/wifi/p2p/WifiP2pDevice;->parseHex(Ljava/lang/String;)I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pDevice;->primaryDeviceType:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;->secondaryDeviceType:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pDevice;->setVendorElements(Ljava/util/List;)V,blocked
 Landroid/net/wifi/p2p/WifiP2pDevice;->status:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;->threeTokenPattern:Ljava/util/regex/Pattern;,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pDevice;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
@@ -6172,13 +7094,13 @@
 Landroid/net/wifi/p2p/WifiP2pGroupList$2;->newArray(I)[Landroid/net/wifi/p2p/WifiP2pGroupList;,blocked
 Landroid/net/wifi/p2p/WifiP2pGroupList$2;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pGroupList$GroupDeleteListener;->onDeleteGroup(I)V,lo-prio,max-target-o
+Landroid/net/wifi/p2p/WifiP2pGroupList;->-$$Nest$fgetisClearCalled(Landroid/net/wifi/p2p/WifiP2pGroupList;)Z,blocked
+Landroid/net/wifi/p2p/WifiP2pGroupList;->-$$Nest$fgetmListener(Landroid/net/wifi/p2p/WifiP2pGroupList;)Landroid/net/wifi/p2p/WifiP2pGroupList$GroupDeleteListener;,blocked
 Landroid/net/wifi/p2p/WifiP2pGroupList;-><clinit>()V,blocked
 Landroid/net/wifi/p2p/WifiP2pGroupList;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pGroupList;-><init>(Landroid/net/wifi/p2p/WifiP2pGroupList;Landroid/net/wifi/p2p/WifiP2pGroupList$GroupDeleteListener;)V,unsupported
 Landroid/net/wifi/p2p/WifiP2pGroupList;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pGroupList;->CREDENTIAL_MAX_NUM:I,lo-prio,max-target-o
-Landroid/net/wifi/p2p/WifiP2pGroupList;->access$000(Landroid/net/wifi/p2p/WifiP2pGroupList;)Landroid/net/wifi/p2p/WifiP2pGroupList$GroupDeleteListener;,blocked
-Landroid/net/wifi/p2p/WifiP2pGroupList;->access$100(Landroid/net/wifi/p2p/WifiP2pGroupList;)Z,blocked
 Landroid/net/wifi/p2p/WifiP2pGroupList;->add(Landroid/net/wifi/p2p/WifiP2pGroup;)V,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pGroupList;->clear()Z,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pGroupList;->contains(I)Z,lo-prio,max-target-o
@@ -6214,21 +7136,23 @@
 Landroid/net/wifi/p2p/WifiP2pManager$Channel$P2pHandler;-><init>(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/os/Looper;)V,blocked
 Landroid/net/wifi/p2p/WifiP2pManager$Channel$P2pHandler;->handleMessage(Landroid/os/Message;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$Channel$P2pHandler;->this$0:Landroid/net/wifi/p2p/WifiP2pManager$Channel;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fgetmAsyncChannel(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fgetmChannelListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fgetmHandler(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Landroid/net/wifi/p2p/WifiP2pManager$Channel$P2pHandler;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fputmChannelListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;)V,blocked
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fputmDnsSdServRspListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$DnsSdServiceResponseListener;)V,blocked
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fputmDnsSdTxtListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$DnsSdTxtRecordListener;)V,blocked
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fputmServRspListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ServiceResponseListener;)V,blocked
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fputmUpnpServRspListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$UpnpServiceResponseListener;)V,blocked
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$mgetListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;I)Ljava/lang/Object;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$mhandleServiceResponse(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;)V,blocked
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$mputListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/Object;)I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$mremoveListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;I)Ljava/lang/Object;,blocked
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;-><init>(Landroid/content/Context;Landroid/os/Looper;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;Landroid/os/Binder;Landroid/net/wifi/p2p/WifiP2pManager;)V,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->INVALID_LISTENER_KEY:I,lo-prio,max-target-o
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$000(Landroid/net/wifi/p2p/WifiP2pManager$Channel;I)Ljava/lang/Object;,blocked
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$100(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;,blocked
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$102(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;)Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;,blocked
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$200(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;)V,blocked
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$300(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Landroid/net/wifi/p2p/WifiP2pManager$Channel$P2pHandler;,blocked
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$400(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;,blocked
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$500(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/Object;)I,blocked
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$602(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ServiceResponseListener;)Landroid/net/wifi/p2p/WifiP2pManager$ServiceResponseListener;,blocked
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$702(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$DnsSdServiceResponseListener;)Landroid/net/wifi/p2p/WifiP2pManager$DnsSdServiceResponseListener;,blocked
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$802(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$DnsSdTxtRecordListener;)Landroid/net/wifi/p2p/WifiP2pManager$DnsSdTxtRecordListener;,blocked
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$902(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$UpnpServiceResponseListener;)Landroid/net/wifi/p2p/WifiP2pManager$UpnpServiceResponseListener;,blocked
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->close()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->finalize()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->getBinder()Landroid/os/Binder;,blocked
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->getListener(I)Ljava/lang/Object;,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->handleDnsSdServiceResponse(Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;)V,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->handleServiceResponse(Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;)V,lo-prio,max-target-o
@@ -6248,12 +7172,24 @@
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mServRspListener:Landroid/net/wifi/p2p/WifiP2pManager$ServiceResponseListener;,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mUpnpServRspListener:Landroid/net/wifi/p2p/WifiP2pManager$UpnpServiceResponseListener;,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->putListener(Ljava/lang/Object;)I,max-target-r
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->removeListener(I)Ljava/lang/Object;,blocked
 Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;->onChannelDisconnected()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$ConnectionInfoListener;->onConnectionInfoAvailable(Landroid/net/wifi/p2p/WifiP2pInfo;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$DeviceInfoListener;->onDeviceInfoAvailable(Landroid/net/wifi/p2p/WifiP2pDevice;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$DiscoveryStateListener;->onDiscoveryStateAvailable(I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$DnsSdServiceResponseListener;->onDnsSdServiceAvailable(Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/p2p/WifiP2pDevice;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$DnsSdTxtRecordListener;->onDnsSdTxtRecordAvailable(Ljava/lang/String;Ljava/util/Map;Landroid/net/wifi/p2p/WifiP2pDevice;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->APPROVER_DETACH_REASON_CLOSE:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->APPROVER_DETACH_REASON_FAILURE:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->APPROVER_DETACH_REASON_REMOVE:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->APPROVER_DETACH_REASON_REPLACE:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->REQUEST_TYPE_INVITATION:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->REQUEST_TYPE_JOIN:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->REQUEST_TYPE_NEGOTIATION:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->onAttached(Landroid/net/MacAddress;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->onConnectionRequested(ILandroid/net/wifi/p2p/WifiP2pConfig;Landroid/net/wifi/p2p/WifiP2pDevice;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->onDetached(Landroid/net/MacAddress;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->onPinGenerated(Landroid/net/MacAddress;Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$GroupInfoListener;->onGroupInfoAvailable(Landroid/net/wifi/p2p/WifiP2pGroup;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$HandoverMessageListener;->onHandoverMessageAvailable(Ljava/lang/String;)V,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager$NetworkInfoListener;->onNetworkInfoAvailable(Landroid/net/NetworkInfo;)V,public-api,sdk,system-api,test-api
@@ -6265,6 +7201,8 @@
 Landroid/net/wifi/p2p/WifiP2pManager$UpnpServiceResponseListener;->onUpnpServiceAvailable(Ljava/util/List;Landroid/net/wifi/p2p/WifiP2pDevice;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;-><init>(Landroid/net/wifi/p2p/IWifiP2pManager;)V,max-target-p
 Landroid/net/wifi/p2p/WifiP2pManager;->ACTION_WIFI_P2P_PERSISTENT_GROUPS_CHANGED:Ljava/lang/String;,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->ACTION_WIFI_P2P_REQUEST_RESPONSE_CHANGED:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->ADD_EXTERNAL_APPROVER:I,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->ADD_LOCAL_SERVICE:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->ADD_LOCAL_SERVICE_FAILED:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->ADD_LOCAL_SERVICE_SUCCEEDED:I,lo-prio,max-target-o
@@ -6286,6 +7224,10 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->CLEAR_SERVICE_REQUESTS_FAILED:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->CLEAR_SERVICE_REQUESTS_SUCCEEDED:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->CONNECT:I,lo-prio,max-target-o
+Landroid/net/wifi/p2p/WifiP2pManager;->CONNECTION_REQUEST_ACCEPT:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->CONNECTION_REQUEST_DEFER_SHOW_PIN_TO_SERVICE:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->CONNECTION_REQUEST_DEFER_TO_SERVICE:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->CONNECTION_REQUEST_REJECT:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->CONNECT_FAILED:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->CONNECT_SUCCEEDED:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->CREATE_GROUP:I,max-target-r
@@ -6301,10 +7243,25 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->DISCOVER_SERVICES_FAILED:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->DISCOVER_SERVICES_SUCCEEDED:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->ERROR:I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTERNAL_APPROVER_ATTACH:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTERNAL_APPROVER_CONNECTION_REQUESTED:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTERNAL_APPROVER_DETACH:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTERNAL_APPROVER_PIN_GENERATED:I,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_DISCOVERY_STATE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_HANDOVER_MESSAGE:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_NETWORK_INFO:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_P2P_DEVICE_LIST:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_CONFIG:Ljava/lang/String;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_DEVICE:Ljava/lang/String;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_DISPLAY_ID:Ljava/lang/String;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_INFORMATION_ELEMENT_LIST:Ljava/lang/String;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_INTERNAL_MESSAGE:Ljava/lang/String;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_PEER_ADDRESS:Ljava/lang/String;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_PEER_DISCOVERY_FREQ:Ljava/lang/String;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_SERVICE_INFO:Ljava/lang/String;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_WPS_PIN:Ljava/lang/String;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_REQUEST_CONFIG:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_REQUEST_RESPONSE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_WIFI_P2P_DEVICE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_WIFI_P2P_GROUP:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_WIFI_P2P_INFO:Ljava/lang/String;,public-api,sdk,system-api,test-api
@@ -6312,6 +7269,9 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->FACTORY_RESET:I,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->FACTORY_RESET_FAILED:I,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->FACTORY_RESET_SUCCEEDED:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->FEATURE_FLEXIBLE_DISCOVERY:J,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->FEATURE_GROUP_CLIENT_REMOVAL:J,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->FEATURE_SET_VENDOR_ELEMENTS:J,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->GET_HANDOVER_REQUEST:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->GET_HANDOVER_SELECT:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->INITIATOR_REPORT_NFC_HANDOVER:I,lo-prio,max-target-o
@@ -6321,6 +7281,12 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->NO_SERVICE_REQUESTS:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->P2P_UNSUPPORTED:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->PING:I,lo-prio,max-target-o
+Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_CLIENT:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_CLIENT_FAILED:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_CLIENT_SUCCEEDED:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_EXTERNAL_APPROVER:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_EXTERNAL_APPROVER_FAILED:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_EXTERNAL_APPROVER_SUCCEEDED:I,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_GROUP:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_GROUP_FAILED:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_GROUP_SUCCEEDED:I,lo-prio,max-target-o
@@ -6356,12 +7322,18 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_CHANNEL:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_CHANNEL_FAILED:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_CHANNEL_SUCCEEDED:I,lo-prio,max-target-o
+Landroid/net/wifi/p2p/WifiP2pManager;->SET_CONNECTION_REQUEST_RESULT:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->SET_CONNECTION_REQUEST_RESULT_FAILED:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->SET_CONNECTION_REQUEST_RESULT_SUCCEEDED:I,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_DEVICE_NAME:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_DEVICE_NAME_FAILED:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_DEVICE_NAME_SUCCEEDED:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_ONGOING_PEER_CONFIG:I,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_ONGOING_PEER_CONFIG_FAILED:I,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_ONGOING_PEER_CONFIG_SUCCEEDED:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->SET_VENDOR_ELEMENTS:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->SET_VENDOR_ELEMENTS_FAILED:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->SET_VENDOR_ELEMENTS_SUCCEEDED:I,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_WFD_INFO:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_WFD_INFO_FAILED:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_WFD_INFO_SUCCEEDED:I,lo-prio,max-target-o
@@ -6384,10 +7356,16 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_DISCOVERY_STARTED:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_DISCOVERY_STOPPED:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_PEERS_CHANGED_ACTION:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_SCAN_FREQ_UNSPECIFIED:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_SCAN_FULL:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_SCAN_SINGLE_FREQ:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_SCAN_SOCIAL:I,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_STATE_CHANGED_ACTION:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_STATE_DISABLED:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_STATE_ENABLED:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_THIS_DEVICE_CHANGED_ACTION:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_VENDOR_ELEMENTS_MAXIMUM_LENGTH:I,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->addExternalApprover(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/MacAddress;Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->addLocalService(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/nsd/WifiP2pServiceInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->addServiceRequest(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->cancelConnect(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
@@ -6402,18 +7380,29 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->createGroup(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->deletePersistentGroup(Landroid/net/wifi/p2p/WifiP2pManager$Channel;ILandroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->discoverPeers(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->discoverPeersOnSocialChannels(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->discoverPeersOnSpecificFrequency(Landroid/net/wifi/p2p/WifiP2pManager$Channel;ILandroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->discoverServices(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->factoryReset(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,sdk,system-api,test-api
-Landroid/net/wifi/p2p/WifiP2pManager;->getMessenger(Landroid/os/Binder;)Landroid/os/Messenger;,lo-prio,max-target-o
-Landroid/net/wifi/p2p/WifiP2pManager;->getMessenger(Landroid/os/Binder;Ljava/lang/String;)Landroid/os/Messenger;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->getMessenger(Landroid/os/Binder;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Messenger;,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->getNfcHandoverRequest(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$HandoverMessageListener;)V,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->getNfcHandoverSelect(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$HandoverMessageListener;)V,lo-prio,max-target-o
+Landroid/net/wifi/p2p/WifiP2pManager;->getP2pMaxAllowedVendorElementsLengthBytes()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->getP2pStateMachineMessenger()Landroid/os/Messenger;,lo-prio,max-target-o
+Landroid/net/wifi/p2p/WifiP2pManager;->getSupportedFeatures()J,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->initialize(Landroid/content/Context;Landroid/os/Looper;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;)Landroid/net/wifi/p2p/WifiP2pManager$Channel;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->initializeChannel(Landroid/content/Context;Landroid/os/Looper;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;Landroid/os/Messenger;Landroid/os/Binder;)Landroid/net/wifi/p2p/WifiP2pManager$Channel;,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->initializeInternal(Landroid/content/Context;Landroid/os/Looper;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;)Landroid/net/wifi/p2p/WifiP2pManager$Channel;,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pManager;->initiatorReportNfcHandover(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/String;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,lo-prio,max-target-o
+Landroid/net/wifi/p2p/WifiP2pManager;->isChannelConstrainedDiscoverySupported()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->isFeatureSupported(J)Z,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->isGroupClientRemovalSupported()Z,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->isSetVendorElementsSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->mService:Landroid/net/wifi/p2p/IWifiP2pManager;,lo-prio,max-target-o
+Landroid/net/wifi/p2p/WifiP2pManager;->prepareExtrasBundle(Landroid/content/Context;)Landroid/os/Bundle;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->prepareExtrasBundle(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Landroid/os/Bundle;,blocked
+Landroid/net/wifi/p2p/WifiP2pManager;->removeClient(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/MacAddress;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->removeExternalApprover(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/MacAddress;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->removeGroup(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->removeLocalService(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/nsd/WifiP2pServiceInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->removeServiceRequest(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
@@ -6427,18 +7416,21 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->requestPeers(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$PeerListListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->requestPersistentGroupInfo(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$PersistentGroupInfoListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->responderReportNfcHandover(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/String;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,lo-prio,max-target-o
+Landroid/net/wifi/p2p/WifiP2pManager;->setConnectionRequestResult(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/MacAddress;ILandroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->setConnectionRequestResult(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/MacAddress;ILjava/lang/String;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setDeviceName(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/String;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setDnsSdResponseListeners(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$DnsSdServiceResponseListener;Landroid/net/wifi/p2p/WifiP2pManager$DnsSdTxtRecordListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setMiracastMode(I)V,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setOngoingPeerConfig(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pConfig;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,blocked
 Landroid/net/wifi/p2p/WifiP2pManager;->setServiceResponseListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ServiceResponseListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setUpnpServiceResponseListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$UpnpServiceResponseListener;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->setVendorElements(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/util/List;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setWFDInfo(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pWfdInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,max-target-r
 Landroid/net/wifi/p2p/WifiP2pManager;->setWfdInfo(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pWfdInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setWifiP2pChannels(Landroid/net/wifi/p2p/WifiP2pManager$Channel;IILandroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,sdk,system-api,test-api
-Landroid/net/wifi/p2p/WifiP2pManager;->startListening(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->startListening(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->startWps(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/WpsInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,unsupported
-Landroid/net/wifi/p2p/WifiP2pManager;->stopListening(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->stopListening(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->stopPeerDiscovery(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pProvDiscEvent;-><init>()V,unsupported
 Landroid/net/wifi/p2p/WifiP2pProvDiscEvent;-><init>(Ljava/lang/String;)V,lo-prio,max-target-o
@@ -6456,6 +7448,7 @@
 Landroid/net/wifi/p2p/WifiP2pWfdInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pWfdInfo$1;->newArray(I)[Landroid/net/wifi/p2p/WifiP2pWfdInfo;,blocked
 Landroid/net/wifi/p2p/WifiP2pWfdInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pWfdInfo;->-$$Nest$mreadFromParcel(Landroid/net/wifi/p2p/WifiP2pWfdInfo;Landroid/os/Parcel;)V,blocked
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;-><clinit>()V,blocked
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;-><init>(III)V,unsupported
@@ -6481,7 +7474,6 @@
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;->PREFERRED_CONNECTIVITY_TDLS:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;->SESSION_AVAILABLE_BIT1:I,lo-prio,max-target-o
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;->SESSION_AVAILABLE_BIT2:I,lo-prio,max-target-o
-Landroid/net/wifi/p2p/WifiP2pWfdInfo;->access$000(Landroid/net/wifi/p2p/WifiP2pWfdInfo;Landroid/os/Parcel;)V,blocked
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;->getControlPort()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;->getDeviceInfo()I,public-api,sdk,system-api,test-api
@@ -6577,7 +7569,7 @@
 Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;-><clinit>()V,blocked
 Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;-><init>(IIILjava/lang/String;)V,lo-prio,max-target-o
-Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;-><init>(IIILjava/lang/String;Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest$1;)V,blocked
+Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;-><init>(IIILjava/lang/String;Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest-IA;)V,blocked
 Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;-><init>(ILjava/lang/String;)V,max-target-p
 Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;->CREATOR:Landroid/os/Parcelable$Creator;,max-target-r
 Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;->describeContents()I,public-api,sdk,system-api,test-api
@@ -6651,7 +7643,7 @@
 Landroid/net/wifi/rtt/CivicLocation$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/CivicLocation;-><clinit>()V,blocked
 Landroid/net/wifi/rtt/CivicLocation;-><init>(Landroid/os/Parcel;)V,blocked
-Landroid/net/wifi/rtt/CivicLocation;-><init>(Landroid/os/Parcel;Landroid/net/wifi/rtt/CivicLocation$1;)V,blocked
+Landroid/net/wifi/rtt/CivicLocation;-><init>(Landroid/os/Parcel;Landroid/net/wifi/rtt/CivicLocation-IA;)V,blocked
 Landroid/net/wifi/rtt/CivicLocation;-><init>([BLjava/lang/String;)V,blocked
 Landroid/net/wifi/rtt/CivicLocation;->ADDRESS_LINE_0_ROOM_DESK_FLOOR:I,blocked
 Landroid/net/wifi/rtt/CivicLocation;->ADDRESS_LINE_1_NUMBER_ROAD_SUFFIX_APT:I,blocked
@@ -6726,31 +7718,27 @@
 Landroid/net/wifi/rtt/IRttCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IRttCallback$Stub$Proxy;->onRangingFailure(I)V,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IRttCallback$Stub$Proxy;->onRangingResults(Ljava/util/List;)V,lo-prio,max-target-o
-Landroid/net/wifi/rtt/IRttCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/rtt/IRttCallback;,blocked
 Landroid/net/wifi/rtt/IRttCallback$Stub;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IRttCallback$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IRttCallback$Stub;->TRANSACTION_onRangingFailure:I,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IRttCallback$Stub;->TRANSACTION_onRangingResults:I,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IRttCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/IRttCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/rtt/IRttCallback;,lo-prio,max-target-o
-Landroid/net/wifi/rtt/IRttCallback$Stub;->getDefaultImpl()Landroid/net/wifi/rtt/IRttCallback;,blocked
 Landroid/net/wifi/rtt/IRttCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/rtt/IRttCallback$Stub;->setDefaultImpl(Landroid/net/wifi/rtt/IRttCallback;)Z,blocked
 Landroid/net/wifi/rtt/IRttCallback;->onRangingFailure(I)V,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IRttCallback;->onRangingResults(Ljava/util/List;)V,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IWifiRttManager$Default;-><init>()V,blocked
 Landroid/net/wifi/rtt/IWifiRttManager$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/IWifiRttManager$Default;->cancelRanging(Landroid/os/WorkSource;)V,blocked
 Landroid/net/wifi/rtt/IWifiRttManager$Default;->isAvailable()Z,blocked
-Landroid/net/wifi/rtt/IWifiRttManager$Default;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;)V,blocked
+Landroid/net/wifi/rtt/IWifiRttManager$Default;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;Landroid/os/Bundle;)V,blocked
 Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->cancelRanging(Landroid/os/WorkSource;)V,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->isAvailable()Z,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;,lo-prio,max-target-o
-Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/rtt/IWifiRttManager;,blocked
-Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;)V,blocked
+Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;Landroid/os/Bundle;)V,blocked
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;-><init>()V,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;->DESCRIPTOR:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;->TRANSACTION_cancelRanging:I,lo-prio,max-target-o
@@ -6758,12 +7746,10 @@
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;->TRANSACTION_startRanging:I,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/rtt/IWifiRttManager;,lo-prio,max-target-o
-Landroid/net/wifi/rtt/IWifiRttManager$Stub;->getDefaultImpl()Landroid/net/wifi/rtt/IWifiRttManager;,blocked
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/rtt/IWifiRttManager$Stub;->setDefaultImpl(Landroid/net/wifi/rtt/IWifiRttManager;)Z,blocked
 Landroid/net/wifi/rtt/IWifiRttManager;->cancelRanging(Landroid/os/WorkSource;)V,lo-prio,max-target-o
 Landroid/net/wifi/rtt/IWifiRttManager;->isAvailable()Z,lo-prio,max-target-o
-Landroid/net/wifi/rtt/IWifiRttManager;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;)V,blocked
+Landroid/net/wifi/rtt/IWifiRttManager;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;Landroid/os/Bundle;)V,blocked
 Landroid/net/wifi/rtt/RangingRequest$1;-><init>()V,blocked
 Landroid/net/wifi/rtt/RangingRequest$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/rtt/RangingRequest;,blocked
 Landroid/net/wifi/rtt/RangingRequest$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -6774,7 +7760,8 @@
 Landroid/net/wifi/rtt/RangingRequest$Builder;->addAccessPoints(Ljava/util/List;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest$Builder;->addNon80211mcCapableAccessPoint(Landroid/net/wifi/ScanResult;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest$Builder;->addNon80211mcCapableAccessPoints(Ljava/util/List;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,sdk,system-api,test-api
-Landroid/net/wifi/rtt/RangingRequest$Builder;->addResponder(Landroid/net/wifi/rtt/ResponderConfig;)Landroid/net/wifi/rtt/RangingRequest$Builder;,sdk,system-api,test-api
+Landroid/net/wifi/rtt/RangingRequest$Builder;->addResponder(Landroid/net/wifi/rtt/ResponderConfig;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/RangingRequest$Builder;->addResponders(Ljava/util/List;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest$Builder;->addWifiAwarePeer(Landroid/net/MacAddress;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest$Builder;->addWifiAwarePeer(Landroid/net/wifi/aware/PeerHandle;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest$Builder;->build()Landroid/net/wifi/rtt/RangingRequest;,public-api,sdk,system-api,test-api
@@ -6783,7 +7770,7 @@
 Landroid/net/wifi/rtt/RangingRequest$Builder;->setRttBurstSize(I)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest;-><clinit>()V,blocked
 Landroid/net/wifi/rtt/RangingRequest;-><init>(Ljava/util/List;I)V,blocked
-Landroid/net/wifi/rtt/RangingRequest;-><init>(Ljava/util/List;ILandroid/net/wifi/rtt/RangingRequest$1;)V,blocked
+Landroid/net/wifi/rtt/RangingRequest;-><init>(Ljava/util/List;ILandroid/net/wifi/rtt/RangingRequest-IA;)V,blocked
 Landroid/net/wifi/rtt/RangingRequest;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest;->DEFAULT_RTT_BURST_SIZE:I,blocked
 Landroid/net/wifi/rtt/RangingRequest;->MAX_PEERS:I,lo-prio,max-target-o
@@ -6858,6 +7845,23 @@
 Landroid/net/wifi/rtt/ResponderConfig$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig$1;->newArray(I)[Landroid/net/wifi/rtt/ResponderConfig;,blocked
 Landroid/net/wifi/rtt/ResponderConfig$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;-><init>()V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->build()Landroid/net/wifi/rtt/ResponderConfig;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mCenterFreq0:I,blocked
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mCenterFreq1:I,blocked
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mChannelWidth:I,blocked
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mFrequency:I,blocked
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mMacAddress:Landroid/net/MacAddress;,blocked
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mPreamble:I,blocked
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mResponderType:I,blocked
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mSupports80211Mc:Z,blocked
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->set80211mcSupported(Z)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->setCenterFreq0Mhz(I)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->setCenterFreq1Mhz(I)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->setChannelWidth(I)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->setFrequencyMhz(I)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->setMacAddress(Landroid/net/MacAddress;)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->setPreamble(I)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;-><clinit>()V,blocked
 Landroid/net/wifi/rtt/ResponderConfig;-><init>(Landroid/net/MacAddress;IZIIIII)V,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;-><init>(Landroid/net/MacAddress;Landroid/net/wifi/aware/PeerHandle;IZIIIII)V,lo-prio,max-target-o
@@ -6865,10 +7869,12 @@
 Landroid/net/wifi/rtt/ResponderConfig;->AWARE_BAND_2_DISCOVERY_CHANNEL:I,lo-prio,max-target-o
 Landroid/net/wifi/rtt/ResponderConfig;->CHANNEL_WIDTH_160MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->CHANNEL_WIDTH_20MHZ:I,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->CHANNEL_WIDTH_320MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->CHANNEL_WIDTH_40MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->CHANNEL_WIDTH_80MHZ:I,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->CHANNEL_WIDTH_80MHZ_PLUS_MHZ:I,sdk,system-api,test-api
-Landroid/net/wifi/rtt/ResponderConfig;->CREATOR:Landroid/os/Parcelable$Creator;,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->PREAMBLE_EHT:I,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->PREAMBLE_HE:I,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->PREAMBLE_HT:I,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->PREAMBLE_LEGACY:I,sdk,system-api,test-api
@@ -6885,10 +7891,17 @@
 Landroid/net/wifi/rtt/ResponderConfig;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->frequency:I,sdk,system-api,test-api
-Landroid/net/wifi/rtt/ResponderConfig;->fromScanResult(Landroid/net/wifi/ScanResult;)Landroid/net/wifi/rtt/ResponderConfig;,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->fromScanResult(Landroid/net/wifi/ScanResult;)Landroid/net/wifi/rtt/ResponderConfig;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->fromWifiAwarePeerHandleWithDefaults(Landroid/net/wifi/aware/PeerHandle;)Landroid/net/wifi/rtt/ResponderConfig;,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->fromWifiAwarePeerMacAddressWithDefaults(Landroid/net/MacAddress;)Landroid/net/wifi/rtt/ResponderConfig;,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->getCenterFreq0Mhz()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->getCenterFreq1Mhz()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->getChannelWidth()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->getFrequencyMhz()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->getMacAddress()Landroid/net/MacAddress;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->getPreamble()I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->is80211mcSupported()Z,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->isValid(Z)Z,lo-prio,max-target-o
 Landroid/net/wifi/rtt/ResponderConfig;->macAddress:Landroid/net/MacAddress;,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->peerHandle:Landroid/net/wifi/aware/PeerHandle;,sdk,system-api,test-api
@@ -6896,7 +7909,10 @@
 Landroid/net/wifi/rtt/ResponderConfig;->responderType:I,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->supports80211mc:Z,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/rtt/ResponderConfig;->translateScanResultChannelWidth(I)I,lo-prio,max-target-o
+Landroid/net/wifi/rtt/ResponderConfig;->translateFromLocalToScanResultChannelWidth(I)I,blocked
+Landroid/net/wifi/rtt/ResponderConfig;->translateFromLocalToScanResultPreamble(I)I,blocked
+Landroid/net/wifi/rtt/ResponderConfig;->translateFromScanResultToLocalChannelWidth(I)I,blocked
+Landroid/net/wifi/rtt/ResponderConfig;->translateFromScanResultToLocalPreamble(I)I,blocked
 Landroid/net/wifi/rtt/ResponderConfig;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderLocation$1;-><init>()V,blocked
 Landroid/net/wifi/rtt/ResponderLocation$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/rtt/ResponderLocation;,blocked
@@ -6905,7 +7921,7 @@
 Landroid/net/wifi/rtt/ResponderLocation$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderLocation;-><clinit>()V,blocked
 Landroid/net/wifi/rtt/ResponderLocation;-><init>(Landroid/os/Parcel;)V,blocked
-Landroid/net/wifi/rtt/ResponderLocation;-><init>(Landroid/os/Parcel;Landroid/net/wifi/rtt/ResponderLocation$1;)V,blocked
+Landroid/net/wifi/rtt/ResponderLocation;-><init>(Landroid/os/Parcel;Landroid/net/wifi/rtt/ResponderLocation-IA;)V,blocked
 Landroid/net/wifi/rtt/ResponderLocation;-><init>([B[B)V,blocked
 Landroid/net/wifi/rtt/ResponderLocation;->ALTITUDE_FLOORS:I,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderLocation;->ALTITUDE_FRACTION_BITS:I,blocked
@@ -7073,13 +8089,13 @@
 Landroid/net/wifi/rtt/ResponderLocation;->toCivicLocationSparseArray()Landroid/util/SparseArray;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderLocation;->toLocation()Landroid/location/Location;,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/ResponderLocation;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/rtt/RangingResultCallback;I)V,blocked
+Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/rtt/RangingResultCallback;Ljava/util/List;)V,blocked
 Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/rtt/RangingResultCallback;,blocked
-Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda0;->f$1:I,blocked
+Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda0;->f$1:Ljava/util/List;,blocked
 Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/rtt/RangingResultCallback;Ljava/util/List;)V,blocked
+Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/rtt/RangingResultCallback;I)V,blocked
 Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/rtt/RangingResultCallback;,blocked
-Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda1;->f$1:Ljava/util/List;,blocked
+Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda1;->f$1:I,blocked
 Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/WifiRttManager$1;-><init>(Landroid/net/wifi/rtt/WifiRttManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/rtt/RangingResultCallback;)V,blocked
 Landroid/net/wifi/rtt/WifiRttManager$1;->lambda$onRangingFailure$0(Landroid/net/wifi/rtt/RangingResultCallback;I)V,blocked
@@ -7099,6 +8115,15 @@
 Landroid/net/wifi/rtt/WifiRttManager;->mService:Landroid/net/wifi/rtt/IWifiRttManager;,lo-prio,max-target-o
 Landroid/net/wifi/rtt/WifiRttManager;->startRanging(Landroid/net/wifi/rtt/RangingRequest;Ljava/util/concurrent/Executor;Landroid/net/wifi/rtt/RangingResultCallback;)V,public-api,sdk,system-api,test-api
 Landroid/net/wifi/rtt/WifiRttManager;->startRanging(Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Ljava/util/concurrent/Executor;Landroid/net/wifi/rtt/RangingResultCallback;)V,sdk,system-api,test-api
+Landroid/net/wifi/util/Environment;-><clinit>()V,blocked
+Landroid/net/wifi/util/Environment;-><init>()V,blocked
+Landroid/net/wifi/util/Environment;->TAG:Ljava/lang/String;,blocked
+Landroid/net/wifi/util/Environment;->WIFI_APEX_NAME:Ljava/lang/String;,blocked
+Landroid/net/wifi/util/Environment;->WIFI_APEX_PATH:Ljava/lang/String;,blocked
+Landroid/net/wifi/util/Environment;->getWifiSharedDirectory()Ljava/io/File;,blocked
+Landroid/net/wifi/util/Environment;->getWifiUserDirectory(I)Ljava/io/File;,blocked
+Landroid/net/wifi/util/Environment;->isAppInWifiApex(Landroid/content/pm/ApplicationInfo;)Z,blocked
+Landroid/net/wifi/util/Environment;->isVndkApiLevelNewerThan(I)Z,blocked
 Landroid/net/wifi/util/HexEncoding;-><clinit>()V,blocked
 Landroid/net/wifi/util/HexEncoding;-><init>()V,blocked
 Landroid/net/wifi/util/HexEncoding;->LOWER_CASE_DIGITS:[C,blocked
@@ -7115,93 +8140,512 @@
 Landroid/net/wifi/util/HexEncoding;->encodeToString([B)Ljava/lang/String;,blocked
 Landroid/net/wifi/util/HexEncoding;->encodeToString([BZ)Ljava/lang/String;,blocked
 Landroid/net/wifi/util/HexEncoding;->toDigit([CI)I,blocked
+Landroid/net/wifi/util/ScanResultUtil;-><init>()V,blocked
+Landroid/net/wifi/util/ScanResultUtil;->TAG:Ljava/lang/String;,blocked
+Landroid/net/wifi/util/ScanResultUtil;->createNetworkFromScanResult(Landroid/net/wifi/ScanResult;)Landroid/net/wifi/WifiConfiguration;,blocked
+Landroid/net/wifi/util/ScanResultUtil;->createQuotedSsid(Ljava/lang/String;)Ljava/lang/String;,blocked
+Landroid/net/wifi/util/ScanResultUtil;->dumpScanResults(Ljava/io/PrintWriter;Ljava/util/List;J)V,blocked
+Landroid/net/wifi/util/ScanResultUtil;->generateSecurityParamsListFromScanResult(Landroid/net/wifi/ScanResult;)Ljava/util/List;,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForDppNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForEapNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForEapSuiteBNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForFilsSha256Network(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForFilsSha384Network(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForOpenNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForOweNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForOweTransitionNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForPasspointR1R2Network(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForPasspointR3Network(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForPmfCapableNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForPmfMandatoryNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForPskNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForPskSaeTransitionNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForSaeNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForUnknownAkmNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForWapiCertNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForWapiPskNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForWepNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForWpa3EnterpriseOnlyNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForWpa3EnterpriseTransitionNetwork(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->redactBssid(Landroid/net/MacAddress;I)Ljava/lang/String;,blocked
+Landroid/net/wifi/util/ScanResultUtil;->validate(Landroid/net/wifi/ScanResult;)Z,blocked
+Landroid/net/wifi/util/ScanResultUtil;->validateScanResultList(Ljava/util/List;)Z,blocked
 Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants$NanParamSizeLimits;-><init>(Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants;)V,blocked
 Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants$NanParamSizeLimits;->MAX_PASSPHRASE_LENGTH:I,blocked
 Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants$NanParamSizeLimits;->MIN_PASSPHRASE_LENGTH:I,blocked
 Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants$NanParamSizeLimits;->this$0:Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants;,blocked
 Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants;-><init>()V,blocked
-Lcom/android/wifi/x/android/os/HandlerExecutor;-><init>(Landroid/os/Handler;)V,blocked
-Lcom/android/wifi/x/android/os/HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/wifi/x/android/os/HandlerExecutor;->mHandler:Landroid/os/Handler;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->apk_verity_mode()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->apk_verity_mode(Ljava/lang/Integer;)V,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$$ExternalSyntheticLambda0;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->$VALUES:[Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;-><clinit>()V,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;-><init>(Ljava/lang/String;ILjava/lang/String;)V,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->DISABLED:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->EMPTY:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->FILTERED:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->FULL:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->getPropValue()Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->propValue:Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->valueOf(Ljava/lang/String;)Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->values()[Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->$VALUES:[Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;-><clinit>()V,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;-><init>(Ljava/lang/String;ILjava/lang/String;)V,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->DISABLED:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->EMPTY:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->FILTERED:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->FULL:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->getPropValue()Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->propValue:Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->valueOf(Ljava/lang/String;)Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->values()[Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->factory_reset()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->factory_reset(Ljava/lang/Boolean;)V,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->getClassOfDevice()Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->getDefaultDeviceName()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->getHardwareIdleCurrentMa()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->getHardwareOperatingVoltageMv()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->getHardwareRxCurrentMa()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->getHardwareTxCurrentMa()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isAdapterAddressValidationEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isGapLePrivacyEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileA2dpSinkEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileA2dpSourceEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileAshaCentralEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileAvrcpControllerEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileAvrcpTargetEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileBapBroadcastAssistEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileBapBroadcastSourceEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileBapUnicastClientEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileBasClientEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileBassClientEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileCcpServerEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileCsipSetCoordinatorEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileGattEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileHapClientEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileHfpAgEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileHfpHfEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileHidDeviceEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileHidHostEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileMapClientEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileMapServerEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileMcpServerEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileOppEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfilePanNapEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfilePanPanuEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfilePbapClientEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfilePbapServerEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileSapServerEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileVcpControllerEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isSupportPersistedStateEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->lambda$getClassOfDevice$0(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->snoop_default_mode()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->snoop_default_mode(Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;)V,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->snoop_log_mode()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->snoop_log_mode(Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;)V,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->media_performance_class()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->hypervisor_protected_vm_supported()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->hypervisor_version()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->hypervisor_vm_supported()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->codec2_dmabuf_padding()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->resolution_limit_32bit()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->swcodec_ion_align()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->swcodec_ion_flags()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->swcodec_ion_heapmask()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->isCellular464XlatEnabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tcp_init_rwnd()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tcp_init_rwnd(Ljava/lang/Integer;)V,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->ab_ota_partitions()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->virtual_ab_enabled()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->virtual_ab_retrofit()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->warm_reset()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->warm_reset(Ljava/lang/Boolean;)V,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->fixed_performance_scale_factor()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->soc_manufacturer()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->soc_model()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties$$ExternalSyntheticLambda0;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->call_ring_delay()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->disable_call()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->ecm_exit_timer()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->ignore_nitz()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->in_ecm_mode()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->in_ecm_mode(Ljava/lang/Boolean;)V,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->lambda$operator_iso_country$0(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->max_active_modems()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->mobile_data()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->multi_sim_config()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->multi_sim_config(Ljava/lang/String;)V,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->operator_idp_string()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->operator_idp_string(Ljava/lang/String;)V,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->operator_iso_country()Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->operator_iso_country(Ljava/util/List;)V,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->reset_on_radio_tech_change()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->ril_sends_multiple_call_ring()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->sim_slots_count()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->test_csim()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->wake_lock_timeout()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->product_vndk_version()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->vendor_vndk_version()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;-><init>()V,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->escape(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->formatList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->start_supplicant()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->start_supplicant(Ljava/lang/Boolean;)V,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->stop_supplicant()Ljava/util/Optional;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->stop_supplicant(Ljava/lang/Boolean;)V,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;,blocked
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;,blocked
 Lcom/android/wifi/x/android/telephony/Annotation;-><init>()V,blocked
-Lcom/android/wifi/x/androidx/annotation/CheckResult;->suggest()Ljava/lang/String;,blocked
-Lcom/android/wifi/x/androidx/annotation/ChecksSdkIntAtLeast;->api()I,blocked
-Lcom/android/wifi/x/androidx/annotation/ChecksSdkIntAtLeast;->codename()Ljava/lang/String;,blocked
-Lcom/android/wifi/x/androidx/annotation/ChecksSdkIntAtLeast;->lambda()I,blocked
-Lcom/android/wifi/x/androidx/annotation/ChecksSdkIntAtLeast;->parameter()I,blocked
-Lcom/android/wifi/x/androidx/annotation/Dimension;->DP:I,blocked
-Lcom/android/wifi/x/androidx/annotation/Dimension;->PX:I,blocked
-Lcom/android/wifi/x/androidx/annotation/Dimension;->SP:I,blocked
-Lcom/android/wifi/x/androidx/annotation/Dimension;->unit()I,blocked
-Lcom/android/wifi/x/androidx/annotation/FloatRange;->from()D,blocked
-Lcom/android/wifi/x/androidx/annotation/FloatRange;->fromInclusive()Z,blocked
-Lcom/android/wifi/x/androidx/annotation/FloatRange;->to()D,blocked
-Lcom/android/wifi/x/androidx/annotation/FloatRange;->toInclusive()Z,blocked
-Lcom/android/wifi/x/androidx/annotation/GuardedBy;->value()Ljava/lang/String;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$EnumEntry;->name()Ljava/lang/String;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$EnumEntry;->value()I,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$FlagEntry;->mask()I,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$FlagEntry;->name()Ljava/lang/String;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$FlagEntry;->target()I,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->$VALUES:[Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;-><clinit>()V,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;-><init>(Ljava/lang/String;I)V,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->COLOR:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->GRAVITY:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->INFERRED:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->INT_ENUM:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->INT_FLAG:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->NONE:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->RESOURCE_ID:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->valueOf(Ljava/lang/String;)Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->values()[Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty;->attributeId()I,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty;->enumMapping()[Lcom/android/wifi/x/androidx/annotation/InspectableProperty$EnumEntry;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty;->flagMapping()[Lcom/android/wifi/x/androidx/annotation/InspectableProperty$FlagEntry;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty;->hasAttributeId()Z,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty;->name()Ljava/lang/String;,blocked
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty;->valueType()Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;,blocked
-Lcom/android/wifi/x/androidx/annotation/IntDef;->flag()Z,blocked
-Lcom/android/wifi/x/androidx/annotation/IntDef;->open()Z,blocked
-Lcom/android/wifi/x/androidx/annotation/IntDef;->value()[I,blocked
-Lcom/android/wifi/x/androidx/annotation/IntRange;->from()J,blocked
-Lcom/android/wifi/x/androidx/annotation/IntRange;->to()J,blocked
-Lcom/android/wifi/x/androidx/annotation/LongDef;->flag()Z,blocked
-Lcom/android/wifi/x/androidx/annotation/LongDef;->open()Z,blocked
-Lcom/android/wifi/x/androidx/annotation/LongDef;->value()[J,blocked
-Lcom/android/wifi/x/androidx/annotation/RequiresApi;->api()I,blocked
-Lcom/android/wifi/x/androidx/annotation/RequiresApi;->value()I,blocked
-Lcom/android/wifi/x/androidx/annotation/RequiresFeature;->enforcement()Ljava/lang/String;,blocked
-Lcom/android/wifi/x/androidx/annotation/RequiresFeature;->name()Ljava/lang/String;,blocked
-Lcom/android/wifi/x/androidx/annotation/RequiresPermission$Read;->value()Lcom/android/wifi/x/androidx/annotation/RequiresPermission;,blocked
-Lcom/android/wifi/x/androidx/annotation/RequiresPermission$Write;->value()Lcom/android/wifi/x/androidx/annotation/RequiresPermission;,blocked
-Lcom/android/wifi/x/androidx/annotation/RequiresPermission;->allOf()[Ljava/lang/String;,blocked
-Lcom/android/wifi/x/androidx/annotation/RequiresPermission;->anyOf()[Ljava/lang/String;,blocked
-Lcom/android/wifi/x/androidx/annotation/RequiresPermission;->conditional()Z,blocked
-Lcom/android/wifi/x/androidx/annotation/RequiresPermission;->value()Ljava/lang/String;,blocked
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->$VALUES:[Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;,blocked
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;-><clinit>()V,blocked
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;-><init>(Ljava/lang/String;I)V,blocked
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->GROUP_ID:Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;,blocked
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->LIBRARY:Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;,blocked
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;,blocked
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;,blocked
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->SUBCLASSES:Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;,blocked
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->TESTS:Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;,blocked
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->valueOf(Ljava/lang/String;)Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;,blocked
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->values()[Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;,blocked
-Lcom/android/wifi/x/androidx/annotation/RestrictTo;->value()[Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;,blocked
-Lcom/android/wifi/x/androidx/annotation/Size;->max()J,blocked
-Lcom/android/wifi/x/androidx/annotation/Size;->min()J,blocked
-Lcom/android/wifi/x/androidx/annotation/Size;->multiple()J,blocked
-Lcom/android/wifi/x/androidx/annotation/Size;->value()J,blocked
-Lcom/android/wifi/x/androidx/annotation/StringDef;->open()Z,blocked
-Lcom/android/wifi/x/androidx/annotation/StringDef;->value()[Ljava/lang/String;,blocked
-Lcom/android/wifi/x/androidx/annotation/VisibleForTesting;->NONE:I,blocked
-Lcom/android/wifi/x/androidx/annotation/VisibleForTesting;->PACKAGE_PRIVATE:I,blocked
-Lcom/android/wifi/x/androidx/annotation/VisibleForTesting;->PRIVATE:I,blocked
-Lcom/android/wifi/x/androidx/annotation/VisibleForTesting;->PROTECTED:I,blocked
-Lcom/android/wifi/x/androidx/annotation/VisibleForTesting;->otherwise()I,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$1ConnectAsync;-><init>(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;Landroid/content/Context;Landroid/os/Handler;Ljava/lang/String;Ljava/lang/String;)V,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$1ConnectAsync;->mDstClassName:Ljava/lang/String;,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$1ConnectAsync;->mDstPackageName:Ljava/lang/String;,blocked
@@ -7216,18 +8660,18 @@
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$DeathMonitor;-><init>(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;)V,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$DeathMonitor;->binderDied()V,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$DeathMonitor;->this$0:Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;,blocked
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->-$$Nest$fgetmLockObject(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;)Ljava/lang/Object;,blocked
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->-$$Nest$fgetmResultMsg(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;)Landroid/os/Message;,blocked
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->-$$Nest$fputmResultMsg(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;Landroid/os/Message;)V,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;-><init>(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;Landroid/os/Looper;)V,blocked
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;-><init>(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;Landroid/os/Looper;Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$1;)V,blocked
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->access$300(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;)Ljava/lang/Object;,blocked
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->access$400(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;)Landroid/os/Message;,blocked
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->access$402(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;Landroid/os/Message;)Landroid/os/Message;,blocked
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;-><init>(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;Landroid/os/Looper;Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler-IA;)V,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->handleMessage(Landroid/os/Message;)V,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->mLockObject:Ljava/lang/Object;,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->mResultMsg:Landroid/os/Message;,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->this$0:Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;,blocked
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->-$$Nest$smsendMessageSynchronously(Landroid/os/Messenger;Landroid/os/Message;)Landroid/os/Message;,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;-><clinit>()V,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->access$100(Landroid/os/Messenger;Landroid/os/Message;)Landroid/os/Message;,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->mHandler:Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->mHandlerThread:Landroid/os/HandlerThread;,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->mMessenger:Landroid/os/Messenger;,blocked
@@ -7236,6 +8680,9 @@
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->sCount:I,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->sStack:Ljava/util/Stack;,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->sendMessageSynchronously(Landroid/os/Messenger;Landroid/os/Message;)Landroid/os/Message;,blocked
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->-$$Nest$fputmDstMessenger(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;Landroid/os/Messenger;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->-$$Nest$mreplyDisconnected(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;I)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->-$$Nest$mreplyHalfConnected(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;I)V,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;-><clinit>()V,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;-><init>()V,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->BASE:I,blocked
@@ -7252,9 +8699,6 @@
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->STATUS_SEND_UNSUCCESSFUL:I,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->STATUS_SUCCESSFUL:I,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->TAG:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->access$000(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;I)V,blocked
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->access$502(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;Landroid/os/Messenger;)Landroid/os/Messenger;,blocked
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->access$600(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;I)V,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->cmdToString(I)Ljava/lang/String;,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->connect(Landroid/content/Context;Landroid/os/Handler;Landroid/os/Handler;)V,blocked
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->connect(Landroid/content/Context;Landroid/os/Handler;Landroid/os/Messenger;)V,blocked
@@ -7314,6 +8758,12 @@
 Lcom/android/wifi/x/com/android/internal/util/AsyncService;->onCreate()V,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/internal/util/AsyncService;->onDestroy()V,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/internal/util/AsyncService;->onStartCommand(Landroid/content/Intent;II)I,public-api,sdk,system-api,test-api
+Lcom/android/wifi/x/com/android/internal/util/IState;->HANDLED:Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/IState;->NOT_HANDLED:Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/IState;->enter()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/IState;->exit()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/IState;->getName()Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/internal/util/IState;->processMessage(Landroid/os/Message;)Z,blocked
 Lcom/android/wifi/x/com/android/internal/util/Preconditions;-><init>()V,blocked
 Lcom/android/wifi/x/com/android/internal/util/Preconditions;->checkArgument(Z)V,blocked
 Lcom/android/wifi/x/com/android/internal/util/Preconditions;->checkArgument(ZLjava/lang/Object;)V,blocked
@@ -7379,23 +8829,233 @@
 Lcom/android/wifi/x/com/android/internal/util/Protocol;->BASE_WIFI_SCANNER_SERVICE:I,blocked
 Lcom/android/wifi/x/com/android/internal/util/Protocol;->BASE_WIFI_WATCHDOG:I,blocked
 Lcom/android/wifi/x/com/android/internal/util/Protocol;->MAX_MESSAGE:I,blocked
+Lcom/android/wifi/x/com/android/internal/util/State;-><init>()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/State;->enter()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/State;->exit()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/State;->getName()Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/internal/util/State;->processMessage(Landroid/os/Message;)Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine;Landroid/os/Message;Ljava/lang/String;Lcom/android/wifi/x/com/android/internal/util/IState;Lcom/android/wifi/x/com/android/internal/util/IState;Lcom/android/wifi/x/com/android/internal/util/IState;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->getDestState()Lcom/android/wifi/x/com/android/internal/util/IState;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->getInfo()Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->getOriginalState()Lcom/android/wifi/x/com/android/internal/util/IState;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->getState()Lcom/android/wifi/x/com/android/internal/util/IState;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->getTime()J,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->getWhat()J,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mDstState:Lcom/android/wifi/x/com/android/internal/util/IState;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mInfo:Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mOrgState:Lcom/android/wifi/x/com/android/internal/util/IState;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mSm:Lcom/android/wifi/x/com/android/internal/util/StateMachine;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mState:Lcom/android/wifi/x/com/android/internal/util/IState;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mTime:J,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mWhat:I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->update(Lcom/android/wifi/x/com/android/internal/util/StateMachine;Landroid/os/Message;Ljava/lang/String;Lcom/android/wifi/x/com/android/internal/util/IState;Lcom/android/wifi/x/com/android/internal/util/IState;Lcom/android/wifi/x/com/android/internal/util/IState;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->-$$Nest$fgetmLogRecVector(Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;)Ljava/util/Vector;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->-$$Nest$fgetmMaxSize(Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;)I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;-><init>()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords-IA;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->DEFAULT_SIZE:I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->add(Lcom/android/wifi/x/com/android/internal/util/StateMachine;Landroid/os/Message;Ljava/lang/String;Lcom/android/wifi/x/com/android/internal/util/IState;Lcom/android/wifi/x/com/android/internal/util/IState;Lcom/android/wifi/x/com/android/internal/util/IState;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->cleanup()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->count()I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->get(I)Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->logOnlyTransitions()Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->mCount:I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->mLogOnlyTransitions:Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->mLogRecVector:Ljava/util/Vector;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->mMaxSize:I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->mOldestIndex:I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->setLogOnlyTransitions(Z)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->setSize(I)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->size()I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$$ExternalSyntheticLambda0;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$$ExternalSyntheticLambda0;->f$0:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState-IA;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState;->processMessage(Landroid/os/Message;)Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState;->this$0:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$QuittingState;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$QuittingState;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$QuittingState-IA;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$QuittingState;->processMessage(Landroid/os/Message;)Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$QuittingState;->this$0:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo-IA;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;->active:Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;->parentStateInfo:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;->state:Lcom/android/wifi/x/com/android/internal/util/State;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;->this$0:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmDbg(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmDeferredMessages(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Ljava/util/ArrayList;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmDestState(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Lcom/android/wifi/x/com/android/internal/util/State;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmHaltingState(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmLogRecords(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmSm(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Lcom/android/wifi/x/com/android/internal/util/StateMachine;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmStateStack(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)[Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmStateStackTopIndex(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$maddState(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/State;Lcom/android/wifi/x/com/android/internal/util/State;)Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mcompleteConstruction(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mdeferMessage(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Landroid/os/Message;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mgetCurrentMessage(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Landroid/os/Message;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mgetCurrentState(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Lcom/android/wifi/x/com/android/internal/util/IState;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$misDbg(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$misQuit(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Landroid/os/Message;)Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mquit(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mquitNow(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mremoveState(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/State;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$msetDbg(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Z)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$msetInitialState(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/State;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mtransitionTo(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/IState;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;-><clinit>()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;-><init>(Landroid/os/Looper;Lcom/android/wifi/x/com/android/internal/util/StateMachine;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;-><init>(Landroid/os/Looper;Lcom/android/wifi/x/com/android/internal/util/StateMachine;Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler-IA;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->addState(Lcom/android/wifi/x/com/android/internal/util/State;Lcom/android/wifi/x/com/android/internal/util/State;)Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->cleanupAfterQuitting()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->completeConstruction()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->deferMessage(Landroid/os/Message;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->getCurrentMessage()Landroid/os/Message;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->getCurrentState()Lcom/android/wifi/x/com/android/internal/util/IState;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->handleMessage(Landroid/os/Message;)V,public-api,sdk,system-api,test-api
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->invokeEnterMethods(I)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->invokeExitMethods(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->isDbg()Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->isQuit(Landroid/os/Message;)Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->lambda$removeState$0(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;)Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mDbg:Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mDeferredMessages:Ljava/util/ArrayList;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mDestState:Lcom/android/wifi/x/com/android/internal/util/State;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mHaltingState:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mHasQuit:Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mInitialState:Lcom/android/wifi/x/com/android/internal/util/State;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mIsConstructionCompleted:Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mLogRecords:Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mMsg:Landroid/os/Message;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mQuittingState:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$QuittingState;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mSm:Lcom/android/wifi/x/com/android/internal/util/StateMachine;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mSmHandlerObj:Ljava/lang/Object;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mStateInfo:Ljava/util/HashMap;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mStateStack:[Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mStateStackTopIndex:I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mTempStateStack:[Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mTempStateStackCount:I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mTransitionInProgress:Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->moveDeferredMessageAtFrontOfQueue()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->moveTempStateStackToStateStack()I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->performTransitions(Lcom/android/wifi/x/com/android/internal/util/State;Landroid/os/Message;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->processMsg(Landroid/os/Message;)Lcom/android/wifi/x/com/android/internal/util/State;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->quit()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->quitNow()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->removeState(Lcom/android/wifi/x/com/android/internal/util/State;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->setDbg(Z)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->setInitialState(Lcom/android/wifi/x/com/android/internal/util/State;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->setupInitialStateStack()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->setupTempStateStackWithStatesToEnter(Lcom/android/wifi/x/com/android/internal/util/State;)Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->transitionTo(Lcom/android/wifi/x/com/android/internal/util/IState;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->-$$Nest$fgetmName(Lcom/android/wifi/x/com/android/internal/util/StateMachine;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->-$$Nest$fgetmSmThread(Lcom/android/wifi/x/com/android/internal/util/StateMachine;)Landroid/os/HandlerThread;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->-$$Nest$fputmSmHandler(Lcom/android/wifi/x/com/android/internal/util/StateMachine;Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->-$$Nest$fputmSmThread(Lcom/android/wifi/x/com/android/internal/util/StateMachine;Landroid/os/HandlerThread;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;-><init>(Ljava/lang/String;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Handler;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->HANDLED:Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->NOT_HANDLED:Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->SM_INIT_CMD:I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->SM_QUIT_CMD:I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->addLogRec(Ljava/lang/String;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->addState(Lcom/android/wifi/x/com/android/internal/util/State;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->addState(Lcom/android/wifi/x/com/android/internal/util/State;Lcom/android/wifi/x/com/android/internal/util/State;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->copyLogRecs()Ljava/util/Collection;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->deferMessage(Landroid/os/Message;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getCurrentMessage()Landroid/os/Message;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getCurrentState()Lcom/android/wifi/x/com/android/internal/util/IState;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getHandler()Landroid/os/Handler;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getLogRec(I)Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getLogRecCount()I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getLogRecMaxSize()I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getLogRecSize()I,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getLogRecString(Landroid/os/Message;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getName()Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getWhatToString(I)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->haltedProcessMessage(Landroid/os/Message;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->hasDeferredMessages(I)Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->hasMessages(I)Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->initStateMachine(Ljava/lang/String;Landroid/os/Looper;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->isDbg()Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->isQuit(Landroid/os/Message;)Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->log(Ljava/lang/String;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->logAndAddLogRec(Ljava/lang/String;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->logd(Ljava/lang/String;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->loge(Ljava/lang/String;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->loge(Ljava/lang/String;Ljava/lang/Throwable;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->logi(Ljava/lang/String;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->logv(Ljava/lang/String;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->logw(Ljava/lang/String;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->mName:Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->mSmHandler:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->mSmThread:Landroid/os/HandlerThread;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->obtainMessage()Landroid/os/Message;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->obtainMessage(I)Landroid/os/Message;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->obtainMessage(II)Landroid/os/Message;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->obtainMessage(ILjava/lang/Object;)Landroid/os/Message;,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->onHalting()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->onPostHandleMessage(Landroid/os/Message;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->onPreHandleMessage(Landroid/os/Message;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->onQuitting()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->quit()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->quitNow()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->recordLogRec(Landroid/os/Message;)Z,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->removeDeferredMessages(I)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->removeMessages(I)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->removeState(Lcom/android/wifi/x/com/android/internal/util/State;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessage(I)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessage(II)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessage(III)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageAtFrontOfQueue(I)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageAtFrontOfQueue(II)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageAtFrontOfQueue(III)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageAtFrontOfQueue(IIILjava/lang/Object;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageAtFrontOfQueue(ILjava/lang/Object;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageAtFrontOfQueue(Landroid/os/Message;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageDelayed(IIIJ)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageDelayed(IIILjava/lang/Object;J)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageDelayed(IIJ)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageDelayed(IJ)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageDelayed(ILjava/lang/Object;J)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageDelayed(Landroid/os/Message;J)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->setDbg(Z)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->setInitialState(Lcom/android/wifi/x/com/android/internal/util/State;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->setLogOnlyTransitions(Z)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->setLogRecSize(I)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->start()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->transitionTo(Lcom/android/wifi/x/com/android/internal/util/IState;)V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->transitionToHaltingState()V,blocked
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->unhandledMessage(Landroid/os/Message;)V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice$1;-><init>(Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;ILjava/lang/Class;I)V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice$1;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice$1;->this$0:Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice$1;->val$N:I,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice$1;->val$callFlags:I,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice$1;->val$listElementClass:Ljava/lang/Class;,blocked
+Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->-$$Nest$fgetmList(Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;)Ljava/util/List;,blocked
+Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->-$$Nest$sfgetDEBUG()Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->-$$Nest$sfgetMAX_IPC_SIZE()I,blocked
+Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->-$$Nest$sfgetTAG()Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->-$$Nest$smverifySameType(Ljava/lang/Class;Ljava/lang/Class;)V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;-><clinit>()V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;-><init>(Ljava/util/List;)V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->DEBUG:Z,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->MAX_IPC_SIZE:I,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->TAG:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->access$000()Z,blocked
-Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->access$100()Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->access$200()I,blocked
-Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->access$300(Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;)Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->access$400(Ljava/lang/Class;Ljava/lang/Class;)V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->getList()Ljava/util/List;,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->mInlineCountLimit:I,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->mList:Ljava/util/List;,blocked
@@ -7445,6 +9105,9 @@
 Lcom/android/wifi/x/com/android/modules/utils/BasicShellCommandHandler;->onHelp()V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BasicShellCommandHandler;->peekNextArg()Ljava/lang/String;,blocked
 Lcom/android/wifi/x/com/android/modules/utils/BasicShellCommandHandler;->peekRemainingArgs()[Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/modules/utils/HandlerExecutor;-><init>(Landroid/os/Handler;)V,blocked
+Lcom/android/wifi/x/com/android/modules/utils/HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/wifi/x/com/android/modules/utils/HandlerExecutor;->mHandler:Landroid/os/Handler;,blocked
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice$1;-><init>()V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice$1;->createFromParcel(Landroid/os/Parcel;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;,blocked
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -7454,7 +9117,7 @@
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;-><clinit>()V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V,blocked
-Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice$1;)V,blocked
+Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice-IA;)V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;-><init>(Ljava/util/List;)V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;->CREATOR:Landroid/os/Parcelable$ClassLoaderCreator;,blocked
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;->describeContents()I,public-api,sdk,system-api,test-api
@@ -7476,7 +9139,7 @@
 Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;-><clinit>()V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V,blocked
-Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice$1;)V,blocked
+Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice-IA;)V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;-><init>(Ljava/util/List;)V,blocked
 Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;->CREATOR:Landroid/os/Parcelable$ClassLoaderCreator;,blocked
 Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;->describeContents()I,public-api,sdk,system-api,test-api
@@ -7493,90 +9156,33 @@
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastPreReleaseCodename(Ljava/lang/String;)Z,blocked
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastR()Z,blocked
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastS()Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastSv2()Z,blocked
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastT()Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->all(Ljava/util/Collection;Ljava/util/function/Predicate;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->any(Landroid/util/SparseArray;Ljava/util/function/Predicate;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->any(Ljava/util/Collection;Ljava/util/function/Predicate;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([II)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->filter(Ljava/util/Collection;Ljava/util/function/Predicate;)Ljava/util/ArrayList;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->indexOf(Ljava/util/Collection;Ljava/util/function/Predicate;)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->indexOf([Ljava/lang/Object;Ljava/lang/Object;)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->isEmpty(Ljava/util/Collection;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->isEmpty([Ljava/lang/Object;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->toIntArray(Ljava/util/Collection;)[I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->toLongArray(Ljava/util/Collection;)[J,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_DEFAULT_MODE:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OFF:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OFF_STRING:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OPPORTUNISTIC:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OPPORTUNISTIC_STRING:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_PROVIDER_HOSTNAME:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_PROVIDER_HOSTNAME_STRING:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_SPECIFIER:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsHostname(Landroid/content/Context;)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsMode(Landroid/content/Context;)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsModeAsInt(Ljava/lang/String;)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsModeAsString(I)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->setPrivateDnsHostname(Landroid/content/Context;Ljava/lang/String;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->setPrivateDnsMode(Landroid/content/Context;I)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;->addressAndPortToString(Ljava/net/InetAddress;I)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;->isIPv6ULA(Ljava/net/InetAddress;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;->saturatedCast(J)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;-><init>(Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;Ljava/nio/ByteBuffer;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->TAG:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->flags:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->getRecordCount(I)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->id:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->mRecordCount:[I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->rcode:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->this$0:Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;-><init>(Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;ILjava/nio/ByteBuffer;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->MAXLABELCOUNT:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->MAXLABELSIZE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->MAXNAMESIZE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->NAME_COMPRESSION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->NAME_NORMAL:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->TAG:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->dName:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->getRR()[B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->labelToString([B)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->mByteFormat:Ljava/text/DecimalFormat;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->mPos:Ljava/text/FieldPosition;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->mRdata:[B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->nsClass:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->nsType:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->parseName(Ljava/nio/ByteBuffer;I)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->this$0:Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->ttl:J,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException;-><init>(Ljava/lang/String;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException;->reason:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;-><clinit>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;-><init>([B)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->ANSECTION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->ARSECTION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->NSSECTION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->NUM_SECTIONS:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->QDSECTION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->TAG:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->mHeader:Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->mRecords:[Ljava/util/List;,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;-><clinit>()V,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;-><init>(ILjava/lang/String;Ljava/util/Set;)V,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->PREVIOUS_CODENAMES:Landroid/util/SparseArray;,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtLeast(Ljava/lang/String;)Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtLeastInternal(Ljava/lang/String;)Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtMost(Ljava/lang/String;)Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtMostInternal(Ljava/lang/String;)Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isCodename(Ljava/lang/String;)Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mCodename:Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mIsReleaseBuild:Z,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mKnownCodenames:Ljava/util/Set;,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mSdkInt:I,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->removeFingerprint(Ljava/lang/String;)Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->sInstance:Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;-><init>()V,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;->createFromParcel(Landroid/os/Parcel;)Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;->newArray(I)[Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;->-$$Nest$fgetmData(Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;)[B,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;-><clinit>()V,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;-><init>()V,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;-><init>(Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;)V,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;-><init>([B)V,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;->CREATOR:Landroid/os/Parcelable$Creator;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;->access$000(Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;)[B,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;->contains(Ljava/lang/String;)Z,blocked
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;->describeContents()I,public-api,sdk,system-api,test-api
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
@@ -7612,76 +9218,9 @@
 Lcom/android/wifi/x/com/android/net/module/util/InetAddressUtils;->INET6_ADDR_LENGTH:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/InetAddressUtils;->parcelInetAddress(Landroid/os/Parcel;Ljava/net/InetAddress;I)V,blocked
 Lcom/android/wifi/x/com/android/net/module/util/InetAddressUtils;->unparcelInetAddress(Landroid/os/Parcel;)Ljava/net/InetAddress;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;-><init>(Landroid/net/IpPrefix;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;-><init>(Ljava/net/InetAddress;Ljava/net/InetAddress;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->SIGNUM_POSITIVE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->addrToBigInteger([B)Ljava/math/BigInteger;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->asIpPrefixes()Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->containsRange(Lcom/android/wifi/x/com/android/net/module/util/IpRange;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getAsInetAddress([B)Ljava/net/InetAddress;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getEndAddr()Ljava/net/InetAddress;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getStartAddr()Ljava/net/InetAddress;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getSubsetPrefixes(Landroid/net/IpPrefix;)Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->mEndAddr:[B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->mStartAddr:[B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->overlapsRange(Lcom/android/wifi/x/com/android/net/module/util/IpRange;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->addressAndPortToString(Ljava/net/InetAddress;I)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->checksum(Ljava/nio/ByteBuffer;III)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->icmpv6Checksum(Ljava/nio/ByteBuffer;III)S,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->intAbs(S)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->ipChecksum(Ljava/nio/ByteBuffer;I)S,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->ipversion(Ljava/nio/ByteBuffer;I)B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->isValidUdpOrTcpPort(I)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->pseudoChecksumIPv4(Ljava/nio/ByteBuffer;III)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->pseudoChecksumIPv6(Ljava/nio/ByteBuffer;III)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->tcpChecksum(Ljava/nio/ByteBuffer;III)S,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->transportChecksum(Ljava/nio/ByteBuffer;IIII)S,blocked
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->udpChecksum(Ljava/nio/ByteBuffer;II)S,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;-><init>(Ljava/util/Collection;Ljava/util/Collection;Ljava/util/function/Function;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->added:Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->removed:Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->updated:Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;-><init>(Ljava/util/Collection;Ljava/util/Collection;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->added:Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->removed:Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->compareAddresses(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalAddresses(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalDnses(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalHttpProxy(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalInterfaceName(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalRoutes(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;-><init>(Landroid/content/Context;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->ERROR_LOCATION_MODE_OFF:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->ERROR_LOCATION_PERMISSION_MISSING:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->SUCCEEDED:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->TAG:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkCallersLocationPermission(Ljava/lang/String;Ljava/lang/String;IZLjava/lang/String;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkLocationPermission(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkLocationPermissionInternal(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkLocationPermissionWithDetailInfo(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkMainlineNetworkStackPermission(I)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkNetworkSettingsPermission(I)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkNetworkSetupWizardPermission(I)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkNetworkStackPermission(I)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkPackage(ILjava/lang/String;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->enforceLocationPermission(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->getCurrentUser()I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->getUidPermission(Ljava/lang/String;I)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->isLocationModeEnabled()Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->isTargetSdkLessThan(Ljava/lang/String;II)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->mAppOpsManager:Landroid/app/AppOpsManager;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->mContext:Landroid/content/Context;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->noteAppOpAllowed(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Z,blocked
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;-><clinit>()V,blocked
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->DEFAULT_MAC_ADDRESS:Ljava/lang/String;,blocked
+Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->DEFAULT_MAC_ADDRESS:Landroid/net/MacAddress;,blocked
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->ETHER_ADDR_LEN:I,blocked
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->LOCALLY_ASSIGNED_MASK:J,blocked
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->MULTICAST_MASK:J,blocked
@@ -7699,128 +9238,3 @@
 Lcom/android/wifi/x/com/android/net/module/util/NetUtils;->getNetworkPart(Ljava/net/InetAddress;I)Ljava/net/InetAddress;,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetUtils;->maskRawAddress([BI)V,blocked
 Lcom/android/wifi/x/com/android/net/module/util/NetUtils;->selectBestRoute(Ljava/util/Collection;Ljava/net/InetAddress;)Landroid/net/RouteInfo;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;-><clinit>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->DISPLAY_TRANSPORT_PRIORITIES:[I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->FORCE_RESTRICTED_CAPABILITIES:J,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_BIP:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_ENTERPRISE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_NOT_VCN_MANAGED:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_OEM_PRIVATE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VEHICLE_INTERNAL:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VSIM:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->RESTRICTED_CAPABILITIES:J,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->UNRESTRICTED_CAPABILITIES:J,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->getDisplayTransport([I)I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->inferRestrictedCapability(Landroid/net/NetworkCapabilities;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->packBits([I)J,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->unpackBits(J)[I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkIdentityUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkIdentityUtils;->scrubSubscriberId(Ljava/lang/String;)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkIdentityUtils;->scrubSubscriberIds([Ljava/lang/String;)[Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;-><clinit>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_ETHER_IPV4_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_HWTYPE_ETHER:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_HWTYPE_RESERVED_HI:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_HWTYPE_RESERVED_LO:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_PAYLOAD_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_REPLY:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_REQUEST:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->DHCP4_CLIENT_PORT:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_ADDR_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_BROADCAST:[B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_DST_ADDR_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_HEADER_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_MTU:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_SRC_ADDR_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_ARP:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_IPV4:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_IPV6:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_LENGTH:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_CHECKSUM_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ECHO_REPLY_TYPE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ECHO_REQUEST_TYPE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_HEADER_MIN_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NA_HEADER_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_LENGTH_SCALING_FACTOR:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MIN_LENGTH:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MTU:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_PIO:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_PREF64:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_RDNSS:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_SLLA:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_TLLA:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_ADVERTISEMENT:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_SOLICITATION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NS_HEADER_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_RA_HEADER_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ROUTER_ADVERTISEMENT:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ROUTER_SOLICITATION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_RS_HEADER_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->INFINITE_LEASE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_ALL:Ljava/net/Inet4Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_ANY:Ljava/net/Inet4Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_BITS:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_CONFLICT_ANNOUNCE_NUM:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_CONFLICT_PROBE_NUM:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_DST_ADDR_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_FLAGS_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_FRAGMENT_MASK:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_HEADER_MIN_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_IHL_MASK:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_MAX_MTU:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_MIN_MTU:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_PROTOCOL_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_SRC_ADDR_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ALL_HOSTS_MULTICAST:Ljava/net/Inet6Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ALL_NODES_MULTICAST:Ljava/net/Inet6Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ALL_ROUTERS_MULTICAST:Ljava/net/Inet6Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ANY:Ljava/net/Inet6Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_DST_ADDR_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_HEADER_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_LEN_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_MIN_MTU:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_PROTOCOL_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_SRC_ADDR_OFFSET:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->NEIGHBOR_ADVERTISEMENT_FLAG_ROUTER:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->NEIGHBOR_ADVERTISEMENT_FLAG_SOLICITED:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->PIO_FLAG_AUTONOMOUS:B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->PIO_FLAG_ON_LINK:B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ROUTER_ADVERTISEMENT_FLAG_MANAGED_ADDRESS:B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ROUTER_ADVERTISEMENT_FLAG_OTHER:B,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_DHCP:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_DHCP_SERVER:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_DNS:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_NEIGHBOR:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_PROBE:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->UDP_HEADER_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->VENDOR_SPECIFIC_IE_ID:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->makeInet4Address(BBBB)Ljava/net/Inet4Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->makeInet6Address([B)Ljava/net/Inet6Address;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->checkAnyPermissionOf(Landroid/content/Context;[Ljava/lang/String;)Z,blocked
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->enforceAnyPermissionOf(Landroid/content/Context;[Ljava/lang/String;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->enforceNetworkStackPermission(Landroid/content/Context;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->enforceNetworkStackPermissionOr(Landroid/content/Context;[Ljava/lang/String;)V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;-><clinit>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;-><init>()V,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->EXCLLIST_PATTERN:Ljava/util/regex/Pattern;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->EXCLLIST_REGEXP:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->EXCL_REGEX:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->HOSTNAME_PATTERN:Ljava/util/regex/Pattern;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->HOSTNAME_REGEXP:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->NAME_IP_REGEX:Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_EXCLLIST_INVALID:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_HOSTNAME_EMPTY:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_HOSTNAME_INVALID:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_PORT_EMPTY:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_PORT_INVALID:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_VALID:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->exclusionListAsString([Ljava/lang/String;)Ljava/lang/String;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->exclusionStringAsList(Ljava/lang/String;)Ljava/util/List;,blocked
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->validate(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I,blocked
diff --git a/current/hiddenapi/annotation-flags.csv b/current/hiddenapi/annotation-flags.csv
index 4c86cae..8fe432d 100644
--- a/current/hiddenapi/annotation-flags.csv
+++ b/current/hiddenapi/annotation-flags.csv
@@ -79,7 +79,6 @@
 Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,unsupported
 Landroid/net/wifi/WifiManager;->mActiveLockCount:I,unsupported
 Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager;,unsupported
-Landroid/net/wifi/WifiSsid;->CREATOR:Landroid/os/Parcelable$Creator;,unsupported
 Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;,unsupported
 Landroid/net/wifi/WifiSsid;->createFromAsciiEncoded(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;,unsupported
 Landroid/net/wifi/WifiSsid;->getOctets()[B,unsupported
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index f6fa65e..c5d5a10 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -1,97 +1,96 @@
 signature,file,startline,startcol,endline,endcol,properties
-Landroid/net/wifi/IWifiManager;->getWifiApEnabledState()I,packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl,189,1,189,25,
-Landroid/net/wifi/IWifiManager;->getWifiApConfiguration()Landroid/net/wifi/WifiConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl,192,1,192,25,
-Landroid/net/wifi/IWifiManager;->getCurrentNetwork()Landroid/net/Network;,packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl,217,1,217,69,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_SSID:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,902,9,902,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_SUPPORTED_RATES:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,905,9,905,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_TIM:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,908,9,908,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_BSS_LOAD:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,911,9,911,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_ERP:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,914,9,914,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_RSN:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,919,9,919,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_SUPPORTED_RATES:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,922,9,922,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_HT_OPERATION:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,925,9,925,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_INTERWORKING:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,928,9,928,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_ROAMING_CONSORTIUM:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,931,9,931,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_CAPS:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,934,9,934,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_VHT_OPERATION:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,939,9,939,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_VSA:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,942,9,942,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->id:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,954,9,954,29,
-Landroid/net/wifi/ScanResult$InformationElement;->bytes:[B,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,960,9,960,29,
-Landroid/net/wifi/ScanResult;->wifiSsid:Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,56,5,56,25,
-Landroid/net/wifi/ScanResult;->hessid:J,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,68,5,68,25,
-Landroid/net/wifi/ScanResult;->anqpDomainId:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,75,5,75,25,
-Landroid/net/wifi/ScanResult;->is80211McRTTResponder:Z,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,458,5,458,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult;->seen:J,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,471,5,471,25,
-Landroid/net/wifi/ScanResult;->numUsage:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,530,5,530,25,
-Landroid/net/wifi/ScanResult;->distanceCm:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,538,5,538,25,
-Landroid/net/wifi/ScanResult;->distanceSdCm:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,546,5,546,25,
-Landroid/net/wifi/ScanResult;->flags:J,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,563,5,563,25,
-Landroid/net/wifi/ScanResult;->anqpLines:Ljava/util/List;,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,894,5,894,25,
-Landroid/net/wifi/ScanResult;->informationElements:[Landroid/net/wifi/ScanResult$InformationElement;,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1060,5,1060,25,
-Landroid/net/wifi/WifiConfiguration;->wepKeyVarNames:[Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,84,5,84,25,
-Landroid/net/wifi/WifiConfiguration;->apBand:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1030,5,1030,25,
-Landroid/net/wifi/WifiConfiguration;->apChannel:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1041,5,1041,25,
-Landroid/net/wifi/WifiConfiguration;->mIpConfiguration:Landroid/net/IpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1235,5,1235,25,
-Landroid/net/wifi/WifiConfiguration;->defaultGwMacAddress:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1248,5,1248,25,
-Landroid/net/wifi/WifiConfiguration;->validatedInternetAccess:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1255,5,1255,25,
-Landroid/net/wifi/WifiConfiguration;->INVALID_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1336,5,1336,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/wifi/WifiConfiguration;->numNoInternetAccessReports:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1343,5,1343,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiConfiguration;->noInternetAccessExpected:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1363,5,1363,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiConfiguration;->selfAdded:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1417,5,1417,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiConfiguration;->isEnterprise()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,2920,5,2920,25,
-Landroid/net/wifi/WifiConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3430,5,3430,25,
-Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3436,5,3436,25,
-Landroid/net/wifi/WifiConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3446,5,3446,25,
-Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3452,5,3452,25,
-Landroid/net/wifi/WifiConfiguration;->getProxySettings()Landroid/net/IpConfiguration$ProxySettings;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3462,5,3462,25,
-Landroid/net/wifi/WifiConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3468,5,3468,25,
-Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3525,5,3525,25,
-Landroid/net/wifi/WifiConfiguration;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3721,5,3721,25,
+Landroid/net/wifi/IWifiManager;->getWifiApEnabledState()I,packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl,220,1,220,25,
+Landroid/net/wifi/IWifiManager;->getWifiApConfiguration()Landroid/net/wifi/WifiConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl,223,1,223,25,
+Landroid/net/wifi/IWifiManager;->getCurrentNetwork()Landroid/net/Network;,packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl,248,1,248,69,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_SSID:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1110,9,1110,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_SUPPORTED_RATES:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1113,9,1113,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_TIM:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1116,9,1116,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_BSS_LOAD:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1121,9,1121,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_ERP:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1124,9,1124,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_RSN:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1129,9,1129,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_SUPPORTED_RATES:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1132,9,1132,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_HT_OPERATION:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1135,9,1135,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_INTERWORKING:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1138,9,1138,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_ROAMING_CONSORTIUM:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1141,9,1141,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_CAPS:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1144,9,1144,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_VHT_OPERATION:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1149,9,1149,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_VSA:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1154,9,1154,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->id:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1184,9,1184,29,
+Landroid/net/wifi/ScanResult$InformationElement;->bytes:[B,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1190,9,1190,29,
+Landroid/net/wifi/ScanResult;->wifiSsid:Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,66,5,66,72,publicAlternatives=%22%7B%40link+%23getWifiSsid%28%29%7D%22
+Landroid/net/wifi/ScanResult;->hessid:J,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,178,5,178,25,
+Landroid/net/wifi/ScanResult;->anqpDomainId:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,185,5,185,25,
+Landroid/net/wifi/ScanResult;->is80211McRTTResponder:Z,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,607,5,607,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult;->seen:J,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,620,5,620,25,
+Landroid/net/wifi/ScanResult;->numUsage:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,679,5,679,25,
+Landroid/net/wifi/ScanResult;->distanceCm:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,687,5,687,25,
+Landroid/net/wifi/ScanResult;->distanceSdCm:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,695,5,695,25,
+Landroid/net/wifi/ScanResult;->flags:J,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,712,5,712,25,
+Landroid/net/wifi/ScanResult;->anqpLines:Ljava/util/List;,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1102,5,1102,25,
+Landroid/net/wifi/ScanResult;->informationElements:[Landroid/net/wifi/ScanResult$InformationElement;,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1296,5,1296,25,
+Landroid/net/wifi/WifiConfiguration;->wepKeyVarNames:[Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,88,5,88,25,
+Landroid/net/wifi/WifiConfiguration;->apBand:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1122,5,1122,25,
+Landroid/net/wifi/WifiConfiguration;->apChannel:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1133,5,1133,25,
+Landroid/net/wifi/WifiConfiguration;->mIpConfiguration:Landroid/net/IpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1327,5,1327,25,
+Landroid/net/wifi/WifiConfiguration;->defaultGwMacAddress:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1340,5,1340,25,
+Landroid/net/wifi/WifiConfiguration;->validatedInternetAccess:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1347,5,1347,25,
+Landroid/net/wifi/WifiConfiguration;->INVALID_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1431,5,1431,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/wifi/WifiConfiguration;->numNoInternetAccessReports:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1438,5,1438,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiConfiguration;->noInternetAccessExpected:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1458,5,1458,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiConfiguration;->selfAdded:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1512,5,1512,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiConfiguration;->isEnterprise()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3251,5,3251,25,
+Landroid/net/wifi/WifiConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3751,5,3751,25,
+Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3757,5,3757,25,
+Landroid/net/wifi/WifiConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3767,5,3767,25,
+Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3773,5,3773,25,
+Landroid/net/wifi/WifiConfiguration;->getProxySettings()Landroid/net/IpConfiguration$ProxySettings;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3783,5,3783,25,
+Landroid/net/wifi/WifiConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3789,5,3789,25,
+Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3850,5,3850,25,
+Landroid/net/wifi/WifiConfiguration;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,4072,5,4072,25,
 Landroid/net/wifi/WifiEnterpriseConfig;->mFields:Ljava/util/HashMap;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,250,5,250,25,
-Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateAlias(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,704,5,704,25,
-Landroid/net/wifi/WifiEnterpriseConfig;->getCaCertificateAlias()Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,745,5,745,25,
-Landroid/net/wifi/WifiInfo;->mBSSID:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,108,5,108,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/wifi/WifiInfo;->mWifiSsid:Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,110,5,110,25,
-Landroid/net/wifi/WifiInfo;->mIpAddress:Ljava/net/InetAddress;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,244,5,244,25,
-Landroid/net/wifi/WifiInfo;->mMacAddress:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,246,5,246,25,
-Landroid/net/wifi/WifiInfo;->score:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,386,5,386,25,
-Landroid/net/wifi/WifiInfo;-><init>()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,429,5,429,25,
-Landroid/net/wifi/WifiInfo;->getWifiSsid()Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,647,5,647,25,
-Landroid/net/wifi/WifiInfo;->setBSSID(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,653,5,653,25,
-Landroid/net/wifi/WifiInfo;->setRssi(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,687,5,687,25,
-Landroid/net/wifi/WifiInfo;->setLinkSpeed(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,723,5,723,25,
-Landroid/net/wifi/WifiInfo;->is5GHz()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,822,5,822,25,
-Landroid/net/wifi/WifiInfo;->setMacAddress(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,839,5,839,25,
-Landroid/net/wifi/WifiInfo;->getMeteredHint()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,878,5,878,25,
-Landroid/net/wifi/WifiInfo;->setNetworkId(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1067,5,1067,25,
-Landroid/net/wifi/WifiInfo;->setSupplicantState(Landroid/net/wifi/SupplicantState;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1096,5,1096,25,
-Landroid/net/wifi/WifiInfo;->setSupplicantState(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1144,5,1144,25,
-Landroid/net/wifi/WifiInfo;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1173,5,1173,25,
-Landroid/net/wifi/WifiInfo;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1286,5,1286,25,
-Landroid/net/wifi/WifiManager;->LINK_CONFIGURATION_CHANGED_ACTION:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1120,5,1120,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiManager;->MIN_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1316,5,1316,25,
-Landroid/net/wifi/WifiManager;->MAX_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1320,5,1320,25,
-Landroid/net/wifi/WifiManager;->RSSI_LEVELS:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1330,5,1330,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_AUTO:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1339,5,1339,25,
-Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_5GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1346,5,1346,25,
-Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_2GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1353,5,1353,25,
-Landroid/net/wifi/WifiManager;->mActiveLockCount:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1374,5,1374,25,
-Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1378,5,1378,25,
-Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,4182,5,4182,25,
-Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,6048,5,6048,25,
-Landroid/net/wifi/WifiManager;->enableVerboseLogging(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,6088,5,6091,6,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+%23setVerboseLoggingEnabled%28boolean%29%7D+instead.%22
-Landroid/net/wifi/WifiSsid;->octets:Ljava/io/ByteArrayOutputStream;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,48,5,48,25,
-Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,53,5,53,25,
-Landroid/net/wifi/WifiSsid;->createFromAsciiEncoded(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,72,5,72,25,
-Landroid/net/wifi/WifiSsid;->getOctets()[B,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,241,5,241,25,
-Landroid/net/wifi/WifiSsid;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,270,5,270,25,
+Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateAlias(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,718,5,718,25,
+Landroid/net/wifi/WifiEnterpriseConfig;->getCaCertificateAlias()Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,769,5,769,25,
+Landroid/net/wifi/WifiInfo;->mBSSID:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,113,5,113,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/wifi/WifiInfo;->mWifiSsid:Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,115,5,115,25,
+Landroid/net/wifi/WifiInfo;->mIpAddress:Ljava/net/InetAddress;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,279,5,279,25,
+Landroid/net/wifi/WifiInfo;->mMacAddress:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,281,5,281,25,
+Landroid/net/wifi/WifiInfo;->score:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,426,5,426,25,
+Landroid/net/wifi/WifiInfo;-><init>()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,491,5,491,25,
+Landroid/net/wifi/WifiInfo;->getWifiSsid()Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,770,5,770,25,
+Landroid/net/wifi/WifiInfo;->setBSSID(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,776,5,776,25,
+Landroid/net/wifi/WifiInfo;->setRssi(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,922,5,922,25,
+Landroid/net/wifi/WifiInfo;->setLinkSpeed(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,958,5,958,25,
+Landroid/net/wifi/WifiInfo;->is5GHz()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1057,5,1057,25,
+Landroid/net/wifi/WifiInfo;->setMacAddress(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1074,5,1074,25,
+Landroid/net/wifi/WifiInfo;->getMeteredHint()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1112,5,1112,25,
+Landroid/net/wifi/WifiInfo;->setNetworkId(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1316,5,1316,25,
+Landroid/net/wifi/WifiInfo;->setSupplicantState(Landroid/net/wifi/SupplicantState;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1345,5,1345,25,
+Landroid/net/wifi/WifiInfo;->setSupplicantState(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1401,5,1401,25,
+Landroid/net/wifi/WifiInfo;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1430,5,1430,25,
+Landroid/net/wifi/WifiInfo;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,1571,5,1571,25,
+Landroid/net/wifi/WifiManager;->LINK_CONFIGURATION_CHANGED_ACTION:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1246,5,1246,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiManager;->MIN_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1442,5,1442,25,
+Landroid/net/wifi/WifiManager;->MAX_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1446,5,1446,25,
+Landroid/net/wifi/WifiManager;->RSSI_LEVELS:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1456,5,1456,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_AUTO:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1465,5,1465,25,
+Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_5GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1472,5,1472,25,
+Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_2GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1479,5,1479,25,
+Landroid/net/wifi/WifiManager;->mActiveLockCount:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1535,5,1535,25,
+Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1539,5,1539,25,
+Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,4832,5,4832,25,
+Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,6859,5,6859,25,
+Landroid/net/wifi/WifiManager;->enableVerboseLogging(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,6899,5,6902,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,214,5,214,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,222,5,222,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,230,5,230,76,publicAlternatives=%22%7B%40link+%23fromBytes%28byte%5B%5D%29%7D%22
+Landroid/net/wifi/WifiSsid;->getOctets()[B,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,240,5,240,69,publicAlternatives=%22%7B%40link+%23getBytes%28%29%7D%22
 Landroid/net/wifi/p2p/WifiP2pConfig;->netId:I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pConfig.java,142,5,142,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/wifi/p2p/WifiP2pConfig;-><init>(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pConfig.java,166,5,166,25,
-Landroid/net/wifi/p2p/WifiP2pDevice;->wpsConfigMethodsSupported:I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pDevice.java,104,5,104,25,
-Landroid/net/wifi/p2p/WifiP2pDevice;->deviceCapability:I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pDevice.java,111,5,111,25,
-Landroid/net/wifi/p2p/WifiP2pDevice;->groupCapability:I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pDevice.java,118,5,118,25,
-Landroid/net/wifi/p2p/WifiP2pDevice;->wfdInfo:Landroid/net/wifi/p2p/WifiP2pWfdInfo;,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pDevice.java,131,5,131,25,
-Landroid/net/wifi/p2p/WifiP2pDevice;-><init>(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pDevice.java,192,5,192,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/p2p/WifiP2pDevice;->wpsConfigMethodsSupported:I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pDevice.java,108,5,108,25,
+Landroid/net/wifi/p2p/WifiP2pDevice;->deviceCapability:I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pDevice.java,115,5,115,25,
+Landroid/net/wifi/p2p/WifiP2pDevice;->groupCapability:I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pDevice.java,122,5,122,25,
+Landroid/net/wifi/p2p/WifiP2pDevice;->wfdInfo:Landroid/net/wifi/p2p/WifiP2pWfdInfo;,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pDevice.java,135,5,135,25,
+Landroid/net/wifi/p2p/WifiP2pDevice;-><init>(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pDevice.java,199,5,199,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/wifi/p2p/WifiP2pDeviceList;->update(Landroid/net/wifi/p2p/WifiP2pDevice;)V,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pDeviceList.java,87,5,87,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/wifi/p2p/WifiP2pDeviceList;->remove(Ljava/lang/String;)Landroid/net/wifi/p2p/WifiP2pDevice;,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pDeviceList.java,151,5,151,25,
 Landroid/net/wifi/p2p/WifiP2pGroup;->TEMPORARY_NET_ID:I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pGroup.java,51,5,51,25,
@@ -102,12 +101,12 @@
 Landroid/net/wifi/p2p/WifiP2pGroup;->setNetworkId(I)V,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pGroup.java,285,5,285,25,
 Landroid/net/wifi/p2p/WifiP2pGroupList;->mGroups:Landroid/util/LruCache;,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pGroupList.java,42,5,42,25,
 Landroid/net/wifi/p2p/WifiP2pGroupList;-><init>(Landroid/net/wifi/p2p/WifiP2pGroupList;Landroid/net/wifi/p2p/WifiP2pGroupList$GroupDeleteListener;)V,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pGroupList.java,59,5,59,25,
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mAsyncChannel:Lcom/android/internal/util/AsyncChannel;,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,916,9,916,29,
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->putListener(Ljava/lang/Object;)I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,1108,9,1108,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/p2p/WifiP2pManager;->CREATE_GROUP:I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,402,5,402,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/p2p/WifiP2pManager;-><init>(Landroid/net/wifi/p2p/IWifiP2pManager;)V,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,604,5,604,88,maxTargetSdk=28&trackingBug=115609023L
-Landroid/net/wifi/p2p/WifiP2pManager;->startWps(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/WpsInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,1420,5,1420,50,trackingBug=185141982L
-Landroid/net/wifi/p2p/WifiP2pManager;->setWFDInfo(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pWfdInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,1701,5,1701,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mAsyncChannel:Lcom/android/internal/util/AsyncChannel;,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,1225,9,1225,29,
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->putListener(Ljava/lang/Object;)I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,1469,9,1469,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/p2p/WifiP2pManager;->CREATE_GROUP:I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,544,5,544,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/p2p/WifiP2pManager;-><init>(Landroid/net/wifi/p2p/IWifiP2pManager;)V,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,785,5,785,88,maxTargetSdk=28&trackingBug=115609023L
+Landroid/net/wifi/p2p/WifiP2pManager;->startWps(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/WpsInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,1995,5,1995,50,trackingBug=185141982L
+Landroid/net/wifi/p2p/WifiP2pManager;->setWFDInfo(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pWfdInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,2335,5,2335,88,maxTargetSdk=30&trackingBug=170729553L
 Landroid/net/wifi/p2p/WifiP2pProvDiscEvent;->event:I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pProvDiscEvent.java,37,5,37,25,
 Landroid/net/wifi/p2p/WifiP2pProvDiscEvent;->device:Landroid/net/wifi/p2p/WifiP2pDevice;,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pProvDiscEvent.java,40,5,40,25,
 Landroid/net/wifi/p2p/WifiP2pProvDiscEvent;->pin:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pProvDiscEvent.java,44,5,44,25,
@@ -140,6 +139,7 @@
 Lcom/android/internal/util/AsyncChannel;->replyToMessage(Landroid/os/Message;ILjava/lang/Object;)V,frameworks/base/core/java/com/android/internal/util/AsyncChannel.java,659,5,659,88,maxTargetSdk=30&trackingBug=170729553L
 Lcom/android/internal/util/AsyncChannel;->sendMessageSynchronously(Landroid/os/Message;)Landroid/os/Message;,frameworks/base/core/java/com/android/internal/util/AsyncChannel.java,673,5,673,88,maxTargetSdk=30&trackingBug=170729553L
 Lcom/android/internal/util/AsyncChannel;->sendMessageSynchronously(III)Landroid/os/Message;,frameworks/base/core/java/com/android/internal/util/AsyncChannel.java,715,5,715,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/IState;->getName()Ljava/lang/String;,frameworks/libs/modules-utils/java/com/android/internal/util/IState.java,71,5,71,25,
 Lcom/android/internal/util/Preconditions;->checkArgument(Z)V,frameworks/libs/modules-utils/java/com/android/internal/util/Preconditions.java,41,5,41,25,
 Lcom/android/internal/util/Preconditions;->checkArgument(ZLjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/Preconditions.java,56,5,56,88,maxTargetSdk=30&trackingBug=170729553L
 Lcom/android/internal/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;,frameworks/libs/modules-utils/java/com/android/internal/util/Preconditions.java,144,5,144,25,
@@ -147,3 +147,23 @@
 Lcom/android/internal/util/Preconditions;->checkState(Z)V,frameworks/libs/modules-utils/java/com/android/internal/util/Preconditions.java,198,5,198,25,
 Lcom/android/internal/util/Preconditions;->checkState(ZLjava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/Preconditions.java,212,5,212,88,maxTargetSdk=30&trackingBug=170729553L
 Lcom/android/internal/util/Preconditions;->checkArgumentInRange(IIILjava/lang/String;)I,frameworks/libs/modules-utils/java/com/android/internal/util/Preconditions.java,522,5,522,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/State;-><init>()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,35,5,35,25,
+Lcom/android/internal/util/State;->enter()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,42,5,42,25,
+Lcom/android/internal/util/State;->exit()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,50,5,50,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/State;->processMessage(Landroid/os/Message;)Z,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,58,5,58,25,
+Lcom/android/internal/util/State;->getName()Ljava/lang/String;,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,76,5,76,25,
+Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1304,5,1304,25,
+Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1318,5,1318,25,
+Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Handler;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1328,5,1328,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->addState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1361,5,1361,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->setInitialState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1380,5,1380,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->transitionTo(Lcom/android/internal/util/IState;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1419,5,1419,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1684,5,1684,25,
+Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1704,5,1704,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1714,5,1714,25,
+Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1728,5,1728,25,
+Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1742,5,1742,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1769,5,1769,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1783,5,1783,25,
+Lcom/android/internal/util/StateMachine;->start()V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2070,5,2070,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2087,5,2087,88,maxTargetSdk=30&trackingBug=170729553L
diff --git a/current/hiddenapi/metadata.csv b/current/hiddenapi/metadata.csv
index 496ee47..8ceef3b 100644
--- a/current/hiddenapi/metadata.csv
+++ b/current/hiddenapi/metadata.csv
@@ -1,7 +1,7 @@
 signature,maxTargetSdk,overrideSourcePosition,publicAlternatives,trackingBug
-|Landroid/net/wifi/IWifiManager;->getCurrentNetwork()Landroid/net/Network;|,|30|,|packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl:217:1:217:69|,||,|170729553|
-|Landroid/net/wifi/IWifiManager;->getWifiApConfiguration()Landroid/net/wifi/WifiConfiguration;|,||,|packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl:192:1:192:25|,||,||
-|Landroid/net/wifi/IWifiManager;->getWifiApEnabledState()I|,||,|packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl:189:1:189:25|,||,||
+|Landroid/net/wifi/IWifiManager;->getCurrentNetwork()Landroid/net/Network;|,|30|,|packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl:248:1:248:69|,||,|170729553|
+|Landroid/net/wifi/IWifiManager;->getWifiApConfiguration()Landroid/net/wifi/WifiConfiguration;|,||,|packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl:223:1:223:25|,||,||
+|Landroid/net/wifi/IWifiManager;->getWifiApEnabledState()I|,||,|packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl:220:1:220:25|,||,||
 |Landroid/net/wifi/ScanResult$InformationElement;->EID_BSS_LOAD:I|,|30|,||,||,|170729553|
 |Landroid/net/wifi/ScanResult$InformationElement;->EID_ERP:I|,|30|,||,||,|170729553|
 |Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_CAPS:I|,|30|,||,||,|170729553|
@@ -27,7 +27,7 @@
 |Landroid/net/wifi/ScanResult;->is80211McRTTResponder:Z|,|30|,||,||,|170729553|
 |Landroid/net/wifi/ScanResult;->numUsage:I|,||,||,||,||
 |Landroid/net/wifi/ScanResult;->seen:J|,||,||,||,||
-|Landroid/net/wifi/ScanResult;->wifiSsid:Landroid/net/wifi/WifiSsid;|,||,||,||,||
+|Landroid/net/wifi/ScanResult;->wifiSsid:Landroid/net/wifi/WifiSsid;|,||,||,|{@link #getWifiSsid()}|,||
 |Landroid/net/wifi/WifiConfiguration;->CREATOR:Landroid/os/Parcelable$Creator;|,||,||,||,||
 |Landroid/net/wifi/WifiConfiguration;->INVALID_RSSI:I|,|28|,||,||,|115609023|
 |Landroid/net/wifi/WifiConfiguration;->apBand:I|,||,||,||,||
@@ -80,11 +80,10 @@
 |Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z|,||,||,||,||
 |Landroid/net/wifi/WifiManager;->mActiveLockCount:I|,||,||,||,||
 |Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager;|,||,||,||,||
-|Landroid/net/wifi/WifiSsid;->CREATOR:Landroid/os/Parcelable$Creator;|,||,||,||,||
-|Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;|,||,||,||,||
-|Landroid/net/wifi/WifiSsid;->createFromAsciiEncoded(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;|,||,||,||,||
-|Landroid/net/wifi/WifiSsid;->getOctets()[B|,||,||,||,||
-|Landroid/net/wifi/WifiSsid;->octets:Ljava/io/ByteArrayOutputStream;|,||,||,||,||
+|Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;|,||,||,|{@link android.net.wifi.WifiManager#UNKNOWN_SSID}|,||
+|Landroid/net/wifi/WifiSsid;->createFromAsciiEncoded(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;|,||,||,|{@link #fromBytes(byte[])}|,||
+|Landroid/net/wifi/WifiSsid;->getOctets()[B|,||,||,|{@link #getBytes()}|,||
+|Landroid/net/wifi/WifiSsid;->octets:Ljava/io/ByteArrayOutputStream;|,||,||,|{@link #getBytes()}|,||
 |Landroid/net/wifi/p2p/WifiP2pConfig;-><init>(Ljava/lang/String;)V|,||,||,||,||
 |Landroid/net/wifi/p2p/WifiP2pConfig;->netId:I|,|30|,||,||,|170729553|
 |Landroid/net/wifi/p2p/WifiP2pDevice;-><init>(Ljava/lang/String;)V|,|30|,||,||,|170729553|
diff --git a/current/hiddenapi/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index fb4b727..d745087 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv
@@ -34,6 +34,170 @@
 Landroid/net/wifi/AnqpInformationElement;->mElementId:I
 Landroid/net/wifi/AnqpInformationElement;->mPayload:[B
 Landroid/net/wifi/AnqpInformationElement;->mVendorId:I
+Landroid/net/wifi/BaseWifiService;-><clinit>()V
+Landroid/net/wifi/BaseWifiService;-><init>()V
+Landroid/net/wifi/BaseWifiService;->TAG:Ljava/lang/String;
+Landroid/net/wifi/BaseWifiService;->acquireMulticastLock(Landroid/os/IBinder;Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->acquireWifiLock(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/WorkSource;)Z
+Landroid/net/wifi/BaseWifiService;->addCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[BLjava/util/List;)V
+Landroid/net/wifi/BaseWifiService;->addNetworkSuggestions(Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)I
+Landroid/net/wifi/BaseWifiService;->addOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V
+Landroid/net/wifi/BaseWifiService;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;Landroid/os/Bundle;)I
+Landroid/net/wifi/BaseWifiService;->addOrUpdateNetworkPrivileged(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Landroid/net/wifi/WifiManager$AddNetworkResult;
+Landroid/net/wifi/BaseWifiService;->addOrUpdatePasspointConfiguration(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->addSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->addWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;)V
+Landroid/net/wifi/BaseWifiService;->allowAutojoin(IZ)V
+Landroid/net/wifi/BaseWifiService;->allowAutojoinGlobal(Z)V
+Landroid/net/wifi/BaseWifiService;->allowAutojoinPasspoint(Ljava/lang/String;Z)V
+Landroid/net/wifi/BaseWifiService;->calculateSignalLevel(I)I
+Landroid/net/wifi/BaseWifiService;->clearExternalPnoScanRequest()V
+Landroid/net/wifi/BaseWifiService;->clearOverrideCountryCode()V
+Landroid/net/wifi/BaseWifiService;->clearWifiConnectedNetworkScorer()V
+Landroid/net/wifi/BaseWifiService;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;)V
+Landroid/net/wifi/BaseWifiService;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->disableEphemeralNetwork(Ljava/lang/String;Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->disableNetwork(ILjava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->disconnect(Ljava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->enableNetwork(IZLjava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->enableTdls(Ljava/lang/String;Z)V
+Landroid/net/wifi/BaseWifiService;->enableTdlsWithMacAddress(Ljava/lang/String;Z)V
+Landroid/net/wifi/BaseWifiService;->enableVerboseLogging(I)V
+Landroid/net/wifi/BaseWifiService;->factoryReset(Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->flushPasspointAnqpCache(Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->forget(ILandroid/net/wifi/IActionListener;)V
+Landroid/net/wifi/BaseWifiService;->getAllMatchingFqdnsForScanResults(Ljava/util/List;)Ljava/util/Map;
+Landroid/net/wifi/BaseWifiService;->getAllMatchingPasspointProfilesForScanResults(Ljava/util/List;)Ljava/util/Map;
+Landroid/net/wifi/BaseWifiService;->getConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Z)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;
+Landroid/net/wifi/BaseWifiService;->getConnectionInfo(Ljava/lang/String;Ljava/lang/String;)Landroid/net/wifi/WifiInfo;
+Landroid/net/wifi/BaseWifiService;->getCountryCode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+Landroid/net/wifi/BaseWifiService;->getCurrentNetwork()Landroid/net/Network;
+Landroid/net/wifi/BaseWifiService;->getCurrentNetworkWpsNfcConfigurationToken()Ljava/lang/String;
+Landroid/net/wifi/BaseWifiService;->getDhcpInfo(Ljava/lang/String;)Landroid/net/DhcpInfo;
+Landroid/net/wifi/BaseWifiService;->getFactoryMacAddresses()[Ljava/lang/String;
+Landroid/net/wifi/BaseWifiService;->getLastCallerInfoForApi(ILandroid/net/wifi/ILastCallerListener;)V
+Landroid/net/wifi/BaseWifiService;->getMatchingOsuProviders(Ljava/util/List;)Ljava/util/Map;
+Landroid/net/wifi/BaseWifiService;->getMatchingPasspointConfigsForOsuProviders(Ljava/util/List;)Ljava/util/Map;
+Landroid/net/wifi/BaseWifiService;->getMatchingScanResults(Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map;
+Landroid/net/wifi/BaseWifiService;->getNetworkSuggestions(Ljava/lang/String;)Ljava/util/List;
+Landroid/net/wifi/BaseWifiService;->getOemPrivilegedWifiAdminPackages()[Ljava/lang/String;
+Landroid/net/wifi/BaseWifiService;->getPasspointConfigurations(Ljava/lang/String;)Ljava/util/List;
+Landroid/net/wifi/BaseWifiService;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;
+Landroid/net/wifi/BaseWifiService;->getPrivilegedConnectedNetwork(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/net/wifi/WifiConfiguration;
+Landroid/net/wifi/BaseWifiService;->getScanResults(Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
+Landroid/net/wifi/BaseWifiService;->getSoftApConfiguration()Landroid/net/wifi/SoftApConfiguration;
+Landroid/net/wifi/BaseWifiService;->getSsidsAllowlist(Ljava/lang/String;)Ljava/util/List;
+Landroid/net/wifi/BaseWifiService;->getStaConcurrencyForMultiInternetMode()I
+Landroid/net/wifi/BaseWifiService;->getSupportedFeatures()J
+Landroid/net/wifi/BaseWifiService;->getUsableChannels(III)Ljava/util/List;
+Landroid/net/wifi/BaseWifiService;->getVerboseLoggingLevel()I
+Landroid/net/wifi/BaseWifiService;->getWifiActivityEnergyInfoAsync(Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;)V
+Landroid/net/wifi/BaseWifiService;->getWifiApConfiguration()Landroid/net/wifi/WifiConfiguration;
+Landroid/net/wifi/BaseWifiService;->getWifiApEnabledState()I
+Landroid/net/wifi/BaseWifiService;->getWifiConfigForMatchedNetworkSuggestionsSharedWithUser(Ljava/util/List;)Ljava/util/List;
+Landroid/net/wifi/BaseWifiService;->getWifiConfigsForPasspointProfiles(Ljava/util/List;)Ljava/util/List;
+Landroid/net/wifi/BaseWifiService;->getWifiEnabledState()I
+Landroid/net/wifi/BaseWifiService;->initializeMulticastFiltering()V
+Landroid/net/wifi/BaseWifiService;->is24GHzBandSupported()Z
+Landroid/net/wifi/BaseWifiService;->is5GHzBandSupported()Z
+Landroid/net/wifi/BaseWifiService;->is60GHzBandSupported()Z
+Landroid/net/wifi/BaseWifiService;->is6GHzBandSupported()Z
+Landroid/net/wifi/BaseWifiService;->isAutoWakeupEnabled()Z
+Landroid/net/wifi/BaseWifiService;->isCarrierNetworkOffloadEnabled(IZ)Z
+Landroid/net/wifi/BaseWifiService;->isDefaultCoexAlgorithmEnabled()Z
+Landroid/net/wifi/BaseWifiService;->isMulticastEnabled()Z
+Landroid/net/wifi/BaseWifiService;->isScanAlwaysAvailable()Z
+Landroid/net/wifi/BaseWifiService;->isScanThrottleEnabled()Z
+Landroid/net/wifi/BaseWifiService;->isWifiPasspointEnabled()Z
+Landroid/net/wifi/BaseWifiService;->isWifiStandardSupported(I)Z
+Landroid/net/wifi/BaseWifiService;->matchProviderWithCurrentNetwork(Ljava/lang/String;)I
+Landroid/net/wifi/BaseWifiService;->notifyMinimumRequiredWifiSecurityLevelChanged(I)V
+Landroid/net/wifi/BaseWifiService;->notifyUserOfApBandConversion(Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->notifyWifiSsidPolicyChanged(ILjava/util/List;)V
+Landroid/net/wifi/BaseWifiService;->queryAutojoinGlobal(Landroid/net/wifi/IBooleanListener;)V
+Landroid/net/wifi/BaseWifiService;->queryPasspointIcon(JLjava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->reassociate(Ljava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->reconnect(Ljava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->registerCoexCallback(Landroid/net/wifi/ICoexCallback;)V
+Landroid/net/wifi/BaseWifiService;->registerDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;Ljava/lang/String;Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->registerLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V
+Landroid/net/wifi/BaseWifiService;->registerNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V
+Landroid/net/wifi/BaseWifiService;->registerScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V
+Landroid/net/wifi/BaseWifiService;->registerSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V
+Landroid/net/wifi/BaseWifiService;->registerSubsystemRestartCallback(Landroid/net/wifi/ISubsystemRestartCallback;)V
+Landroid/net/wifi/BaseWifiService;->registerSuggestionConnectionStatusListener(Landroid/net/wifi/ISuggestionConnectionStatusListener;Ljava/lang/String;Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->registerTrafficStateCallback(Landroid/net/wifi/ITrafficStateCallback;)V
+Landroid/net/wifi/BaseWifiService;->releaseMulticastLock(Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->releaseWifiLock(Landroid/os/IBinder;)Z
+Landroid/net/wifi/BaseWifiService;->removeAppState(ILjava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->removeCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[B)V
+Landroid/net/wifi/BaseWifiService;->removeNetwork(ILjava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;I)I
+Landroid/net/wifi/BaseWifiService;->removeNonCallerConfiguredNetworks(Ljava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->removeOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V
+Landroid/net/wifi/BaseWifiService;->removePasspointConfiguration(Ljava/lang/String;Ljava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->removeSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;)V
+Landroid/net/wifi/BaseWifiService;->replyToP2pInvitationReceivedDialog(IZLjava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->replyToSimpleDialog(II)V
+Landroid/net/wifi/BaseWifiService;->reportCreateInterfaceImpact(Ljava/lang/String;IZLandroid/net/wifi/IInterfaceCreationInfoCallback;)V
+Landroid/net/wifi/BaseWifiService;->restartWifiSubsystem()V
+Landroid/net/wifi/BaseWifiService;->restoreBackupData([B)V
+Landroid/net/wifi/BaseWifiService;->restoreSoftApBackupData([B)Landroid/net/wifi/SoftApConfiguration;
+Landroid/net/wifi/BaseWifiService;->restoreSupplicantBackupData([B[B)V
+Landroid/net/wifi/BaseWifiService;->retrieveBackupData()[B
+Landroid/net/wifi/BaseWifiService;->retrieveSoftApBackupData()[B
+Landroid/net/wifi/BaseWifiService;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;)V
+Landroid/net/wifi/BaseWifiService;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->setAutoWakeupEnabled(Z)V
+Landroid/net/wifi/BaseWifiService;->setCarrierNetworkOffloadEnabled(IZZ)V
+Landroid/net/wifi/BaseWifiService;->setCoexUnsafeChannels(Ljava/util/List;I)V
+Landroid/net/wifi/BaseWifiService;->setDefaultCountryCode(Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->setDeviceMobilityState(I)V
+Landroid/net/wifi/BaseWifiService;->setEmergencyScanRequestInProgress(Z)V
+Landroid/net/wifi/BaseWifiService;->setExternalPnoScanRequest(Landroid/os/IBinder;Landroid/net/wifi/IPnoScanResultsCallback;Ljava/util/List;[ILjava/lang/String;Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->setMacRandomizationSettingPasspointEnabled(Ljava/lang/String;Z)V
+Landroid/net/wifi/BaseWifiService;->setOneShotScreenOnConnectivityScanDelayMillis(I)V
+Landroid/net/wifi/BaseWifiService;->setOverrideCountryCode(Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->setPasspointMeteredOverride(Ljava/lang/String;I)V
+Landroid/net/wifi/BaseWifiService;->setScanAlwaysAvailable(ZLjava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->setScanThrottleEnabled(Z)V
+Landroid/net/wifi/BaseWifiService;->setScreenOnScanSchedule([I[I)V
+Landroid/net/wifi/BaseWifiService;->setSoftApConfiguration(Landroid/net/wifi/SoftApConfiguration;Ljava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->setSsidsAllowlist(Ljava/lang/String;Ljava/util/List;)V
+Landroid/net/wifi/BaseWifiService;->setStaConcurrencyForMultiInternetMode(I)Z
+Landroid/net/wifi/BaseWifiService;->setWifiApConfiguration(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->setWifiConnectedNetworkScorer(Landroid/os/IBinder;Landroid/net/wifi/IWifiConnectedNetworkScorer;)Z
+Landroid/net/wifi/BaseWifiService;->setWifiEnabled(Ljava/lang/String;Z)Z
+Landroid/net/wifi/BaseWifiService;->setWifiPasspointEnabled(Z)V
+Landroid/net/wifi/BaseWifiService;->setWifiScoringEnabled(Z)Z
+Landroid/net/wifi/BaseWifiService;->startDppAsConfiguratorInitiator(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;IILandroid/net/wifi/IDppCallback;)V
+Landroid/net/wifi/BaseWifiService;->startDppAsEnrolleeInitiator(Landroid/os/IBinder;Ljava/lang/String;Landroid/net/wifi/IDppCallback;)V
+Landroid/net/wifi/BaseWifiService;->startDppAsEnrolleeResponder(Landroid/os/IBinder;Ljava/lang/String;ILandroid/net/wifi/IDppCallback;)V
+Landroid/net/wifi/BaseWifiService;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;Landroid/os/Bundle;)I
+Landroid/net/wifi/BaseWifiService;->startRestrictingAutoJoinToSubscriptionId(I)V
+Landroid/net/wifi/BaseWifiService;->startScan(Ljava/lang/String;Ljava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->startSoftAp(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->startSubscriptionProvisioning(Landroid/net/wifi/hotspot2/OsuProvider;Landroid/net/wifi/hotspot2/IProvisioningCallback;)V
+Landroid/net/wifi/BaseWifiService;->startTetheredHotspot(Landroid/net/wifi/SoftApConfiguration;Ljava/lang/String;)Z
+Landroid/net/wifi/BaseWifiService;->startWatchLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;)V
+Landroid/net/wifi/BaseWifiService;->stopDppSession()V
+Landroid/net/wifi/BaseWifiService;->stopLocalOnlyHotspot()V
+Landroid/net/wifi/BaseWifiService;->stopRestrictingAutoJoinToSubscriptionId()V
+Landroid/net/wifi/BaseWifiService;->stopSoftAp()Z
+Landroid/net/wifi/BaseWifiService;->stopWatchLocalOnlyHotspot()V
+Landroid/net/wifi/BaseWifiService;->unregisterCoexCallback(Landroid/net/wifi/ICoexCallback;)V
+Landroid/net/wifi/BaseWifiService;->unregisterDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;)V
+Landroid/net/wifi/BaseWifiService;->unregisterLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V
+Landroid/net/wifi/BaseWifiService;->unregisterNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V
+Landroid/net/wifi/BaseWifiService;->unregisterScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V
+Landroid/net/wifi/BaseWifiService;->unregisterSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V
+Landroid/net/wifi/BaseWifiService;->unregisterSubsystemRestartCallback(Landroid/net/wifi/ISubsystemRestartCallback;)V
+Landroid/net/wifi/BaseWifiService;->unregisterSuggestionConnectionStatusListener(Landroid/net/wifi/ISuggestionConnectionStatusListener;Ljava/lang/String;)V
+Landroid/net/wifi/BaseWifiService;->unregisterTrafficStateCallback(Landroid/net/wifi/ITrafficStateCallback;)V
+Landroid/net/wifi/BaseWifiService;->updateInterfaceIpState(Ljava/lang/String;I)V
+Landroid/net/wifi/BaseWifiService;->updateWifiLockWorkSource(Landroid/os/IBinder;Landroid/os/WorkSource;)V
+Landroid/net/wifi/BaseWifiService;->updateWifiUsabilityScore(III)V
 Landroid/net/wifi/BatchedScanResult$1;-><init>()V
 Landroid/net/wifi/BatchedScanResult$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/BatchedScanResult;
 Landroid/net/wifi/BatchedScanResult$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -138,18 +302,30 @@
 Landroid/net/wifi/IActionListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/IActionListener$Stub$Proxy;->onFailure(I)V
 Landroid/net/wifi/IActionListener$Stub$Proxy;->onSuccess()V
-Landroid/net/wifi/IActionListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IActionListener;
 Landroid/net/wifi/IActionListener$Stub;-><init>()V
 Landroid/net/wifi/IActionListener$Stub;->TRANSACTION_onFailure:I
 Landroid/net/wifi/IActionListener$Stub;->TRANSACTION_onSuccess:I
 Landroid/net/wifi/IActionListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IActionListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IActionListener;
-Landroid/net/wifi/IActionListener$Stub;->getDefaultImpl()Landroid/net/wifi/IActionListener;
 Landroid/net/wifi/IActionListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/IActionListener$Stub;->setDefaultImpl(Landroid/net/wifi/IActionListener;)Z
 Landroid/net/wifi/IActionListener;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/IActionListener;->onFailure(I)V
 Landroid/net/wifi/IActionListener;->onSuccess()V
+Landroid/net/wifi/IBooleanListener$Default;-><init>()V
+Landroid/net/wifi/IBooleanListener$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IBooleanListener$Default;->onResult(Z)V
+Landroid/net/wifi/IBooleanListener$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
+Landroid/net/wifi/IBooleanListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IBooleanListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
+Landroid/net/wifi/IBooleanListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;
+Landroid/net/wifi/IBooleanListener$Stub$Proxy;->onResult(Z)V
+Landroid/net/wifi/IBooleanListener$Stub;-><init>()V
+Landroid/net/wifi/IBooleanListener$Stub;->TRANSACTION_onResult:I
+Landroid/net/wifi/IBooleanListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IBooleanListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IBooleanListener;
+Landroid/net/wifi/IBooleanListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/wifi/IBooleanListener;->DESCRIPTOR:Ljava/lang/String;
+Landroid/net/wifi/IBooleanListener;->onResult(Z)V
 Landroid/net/wifi/ICoexCallback$Default;-><init>()V
 Landroid/net/wifi/ICoexCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/ICoexCallback$Default;->onCoexUnsafeChannelsChanged(Ljava/util/List;I)V
@@ -158,14 +334,11 @@
 Landroid/net/wifi/ICoexCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/ICoexCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/ICoexCallback$Stub$Proxy;->onCoexUnsafeChannelsChanged(Ljava/util/List;I)V
-Landroid/net/wifi/ICoexCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ICoexCallback;
 Landroid/net/wifi/ICoexCallback$Stub;-><init>()V
 Landroid/net/wifi/ICoexCallback$Stub;->TRANSACTION_onCoexUnsafeChannelsChanged:I
 Landroid/net/wifi/ICoexCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/ICoexCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ICoexCallback;
-Landroid/net/wifi/ICoexCallback$Stub;->getDefaultImpl()Landroid/net/wifi/ICoexCallback;
 Landroid/net/wifi/ICoexCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/ICoexCallback$Stub;->setDefaultImpl(Landroid/net/wifi/ICoexCallback;)Z
 Landroid/net/wifi/ICoexCallback;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/ICoexCallback;->onCoexUnsafeChannelsChanged(Ljava/util/List;I)V
 Landroid/net/wifi/IDppCallback$Default;-><init>()V
@@ -184,7 +357,6 @@
 Landroid/net/wifi/IDppCallback$Stub$Proxy;->onProgress(I)V
 Landroid/net/wifi/IDppCallback$Stub$Proxy;->onSuccess(I)V
 Landroid/net/wifi/IDppCallback$Stub$Proxy;->onSuccessConfigReceived(I)V
-Landroid/net/wifi/IDppCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IDppCallback;
 Landroid/net/wifi/IDppCallback$Stub;-><init>()V
 Landroid/net/wifi/IDppCallback$Stub;->TRANSACTION_onBootstrapUriGenerated:I
 Landroid/net/wifi/IDppCallback$Stub;->TRANSACTION_onFailure:I
@@ -193,15 +365,43 @@
 Landroid/net/wifi/IDppCallback$Stub;->TRANSACTION_onSuccessConfigReceived:I
 Landroid/net/wifi/IDppCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IDppCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IDppCallback;
-Landroid/net/wifi/IDppCallback$Stub;->getDefaultImpl()Landroid/net/wifi/IDppCallback;
 Landroid/net/wifi/IDppCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/IDppCallback$Stub;->setDefaultImpl(Landroid/net/wifi/IDppCallback;)Z
 Landroid/net/wifi/IDppCallback;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/IDppCallback;->onBootstrapUriGenerated(Ljava/lang/String;)V
 Landroid/net/wifi/IDppCallback;->onFailure(ILjava/lang/String;Ljava/lang/String;[I)V
 Landroid/net/wifi/IDppCallback;->onProgress(I)V
 Landroid/net/wifi/IDppCallback;->onSuccess(I)V
 Landroid/net/wifi/IDppCallback;->onSuccessConfigReceived(I)V
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Default;-><init>()V
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Default;->onResults(Z[I[Ljava/lang/String;)V
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub$Proxy;->onResults(Z[I[Ljava/lang/String;)V
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub;-><init>()V
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub;->TRANSACTION_onResults:I
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IInterfaceCreationInfoCallback;
+Landroid/net/wifi/IInterfaceCreationInfoCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/wifi/IInterfaceCreationInfoCallback;->DESCRIPTOR:Ljava/lang/String;
+Landroid/net/wifi/IInterfaceCreationInfoCallback;->onResults(Z[I[Ljava/lang/String;)V
+Landroid/net/wifi/ILastCallerListener$Default;-><init>()V
+Landroid/net/wifi/ILastCallerListener$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/ILastCallerListener$Default;->onResult(Ljava/lang/String;Z)V
+Landroid/net/wifi/ILastCallerListener$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
+Landroid/net/wifi/ILastCallerListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/ILastCallerListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
+Landroid/net/wifi/ILastCallerListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;
+Landroid/net/wifi/ILastCallerListener$Stub$Proxy;->onResult(Ljava/lang/String;Z)V
+Landroid/net/wifi/ILastCallerListener$Stub;-><init>()V
+Landroid/net/wifi/ILastCallerListener$Stub;->TRANSACTION_onResult:I
+Landroid/net/wifi/ILastCallerListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/ILastCallerListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ILastCallerListener;
+Landroid/net/wifi/ILastCallerListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/wifi/ILastCallerListener;->DESCRIPTOR:Ljava/lang/String;
+Landroid/net/wifi/ILastCallerListener;->onResult(Ljava/lang/String;Z)V
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Default;-><init>()V
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Default;->onHotspotFailed(I)V
@@ -214,16 +414,13 @@
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub$Proxy;->onHotspotFailed(I)V
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub$Proxy;->onHotspotStarted(Landroid/net/wifi/SoftApConfiguration;)V
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub$Proxy;->onHotspotStopped()V
-Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ILocalOnlyHotspotCallback;
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;-><init>()V
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->TRANSACTION_onHotspotFailed:I
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->TRANSACTION_onHotspotStarted:I
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->TRANSACTION_onHotspotStopped:I
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ILocalOnlyHotspotCallback;
-Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->getDefaultImpl()Landroid/net/wifi/ILocalOnlyHotspotCallback;
 Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/ILocalOnlyHotspotCallback$Stub;->setDefaultImpl(Landroid/net/wifi/ILocalOnlyHotspotCallback;)Z
 Landroid/net/wifi/ILocalOnlyHotspotCallback;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/ILocalOnlyHotspotCallback;->onHotspotFailed(I)V
 Landroid/net/wifi/ILocalOnlyHotspotCallback;->onHotspotStarted(Landroid/net/wifi/SoftApConfiguration;)V
@@ -244,7 +441,6 @@
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub$Proxy;->onUserSelectionCallbackRegistration(Landroid/net/wifi/INetworkRequestUserSelectionCallback;)V
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub$Proxy;->onUserSelectionConnectFailure(Landroid/net/wifi/WifiConfiguration;)V
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub$Proxy;->onUserSelectionConnectSuccess(Landroid/net/wifi/WifiConfiguration;)V
-Landroid/net/wifi/INetworkRequestMatchCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/INetworkRequestMatchCallback;
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;-><init>()V
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->TRANSACTION_onAbort:I
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->TRANSACTION_onMatch:I
@@ -253,9 +449,7 @@
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->TRANSACTION_onUserSelectionConnectSuccess:I
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/INetworkRequestMatchCallback;
-Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->getDefaultImpl()Landroid/net/wifi/INetworkRequestMatchCallback;
 Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/INetworkRequestMatchCallback$Stub;->setDefaultImpl(Landroid/net/wifi/INetworkRequestMatchCallback;)Z
 Landroid/net/wifi/INetworkRequestMatchCallback;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/INetworkRequestMatchCallback;->onAbort()V
 Landroid/net/wifi/INetworkRequestMatchCallback;->onMatch(Ljava/util/List;)V
@@ -271,16 +465,13 @@
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub$Proxy;->reject()V
-Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/INetworkRequestUserSelectionCallback;
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub$Proxy;->select(Landroid/net/wifi/WifiConfiguration;)V
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;-><init>()V
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->TRANSACTION_reject:I
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->TRANSACTION_select:I
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/INetworkRequestUserSelectionCallback;
-Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->getDefaultImpl()Landroid/net/wifi/INetworkRequestUserSelectionCallback;
 Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/INetworkRequestUserSelectionCallback$Stub;->setDefaultImpl(Landroid/net/wifi/INetworkRequestUserSelectionCallback;)Z
 Landroid/net/wifi/INetworkRequestUserSelectionCallback;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/INetworkRequestUserSelectionCallback;->reject()V
 Landroid/net/wifi/INetworkRequestUserSelectionCallback;->select(Landroid/net/wifi/WifiConfiguration;)V
@@ -292,16 +483,28 @@
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub$Proxy;->onWifiActivityEnergyInfo(Landroid/os/connectivity/WifiActivityEnergyInfo;)V
-Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;-><init>()V
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;->TRANSACTION_onWifiActivityEnergyInfo:I
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;
-Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;->getDefaultImpl()Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/IOnWifiActivityEnergyInfoListener$Stub;->setDefaultImpl(Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;)Z
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/IOnWifiActivityEnergyInfoListener;->onWifiActivityEnergyInfo(Landroid/os/connectivity/WifiActivityEnergyInfo;)V
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Default;-><init>()V
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Default;->onDriverCountryCodeChanged(Ljava/lang/String;)V
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub$Proxy;->onDriverCountryCodeChanged(Ljava/lang/String;)V
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub;-><init>()V
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub;->TRANSACTION_onDriverCountryCodeChanged:I
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;->DESCRIPTOR:Ljava/lang/String;
+Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;->onDriverCountryCodeChanged(Ljava/lang/String;)V
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Default;-><init>()V
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Default;->onWifiUsabilityStats(IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V
@@ -310,16 +513,40 @@
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub$Proxy;->onWifiUsabilityStats(IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V
-Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IOnWifiUsabilityStatsListener;
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;-><init>()V
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;->TRANSACTION_onWifiUsabilityStats:I
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IOnWifiUsabilityStatsListener;
-Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;->getDefaultImpl()Landroid/net/wifi/IOnWifiUsabilityStatsListener;
 Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/IOnWifiUsabilityStatsListener$Stub;->setDefaultImpl(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)Z
 Landroid/net/wifi/IOnWifiUsabilityStatsListener;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/IOnWifiUsabilityStatsListener;->onWifiUsabilityStats(IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V
+Landroid/net/wifi/IPnoScanResultsCallback$Default;-><init>()V
+Landroid/net/wifi/IPnoScanResultsCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IPnoScanResultsCallback$Default;->onRegisterFailed(I)V
+Landroid/net/wifi/IPnoScanResultsCallback$Default;->onRegisterSuccess()V
+Landroid/net/wifi/IPnoScanResultsCallback$Default;->onRemoved(I)V
+Landroid/net/wifi/IPnoScanResultsCallback$Default;->onScanResultsAvailable(Ljava/util/List;)V
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->onRegisterFailed(I)V
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->onRegisterSuccess()V
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->onRemoved(I)V
+Landroid/net/wifi/IPnoScanResultsCallback$Stub$Proxy;->onScanResultsAvailable(Ljava/util/List;)V
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;-><init>()V
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->TRANSACTION_onRegisterFailed:I
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->TRANSACTION_onRegisterSuccess:I
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->TRANSACTION_onRemoved:I
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->TRANSACTION_onScanResultsAvailable:I
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IPnoScanResultsCallback;
+Landroid/net/wifi/IPnoScanResultsCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/wifi/IPnoScanResultsCallback;->DESCRIPTOR:Ljava/lang/String;
+Landroid/net/wifi/IPnoScanResultsCallback;->onRegisterFailed(I)V
+Landroid/net/wifi/IPnoScanResultsCallback;->onRegisterSuccess()V
+Landroid/net/wifi/IPnoScanResultsCallback;->onRemoved(I)V
+Landroid/net/wifi/IPnoScanResultsCallback;->onScanResultsAvailable(Ljava/util/List;)V
 Landroid/net/wifi/IScanResultsCallback$Default;-><init>()V
 Landroid/net/wifi/IScanResultsCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IScanResultsCallback$Default;->onScanResultsAvailable()V
@@ -328,14 +555,11 @@
 Landroid/net/wifi/IScanResultsCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/IScanResultsCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/IScanResultsCallback$Stub$Proxy;->onScanResultsAvailable()V
-Landroid/net/wifi/IScanResultsCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IScanResultsCallback;
 Landroid/net/wifi/IScanResultsCallback$Stub;-><init>()V
 Landroid/net/wifi/IScanResultsCallback$Stub;->TRANSACTION_onScanResultsAvailable:I
 Landroid/net/wifi/IScanResultsCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IScanResultsCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IScanResultsCallback;
-Landroid/net/wifi/IScanResultsCallback$Stub;->getDefaultImpl()Landroid/net/wifi/IScanResultsCallback;
 Landroid/net/wifi/IScanResultsCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/IScanResultsCallback$Stub;->setDefaultImpl(Landroid/net/wifi/IScanResultsCallback;)Z
 Landroid/net/wifi/IScanResultsCallback;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/IScanResultsCallback;->onScanResultsAvailable()V
 Landroid/net/wifi/IScanResultsListener$Default;-><init>()V
@@ -346,14 +570,11 @@
 Landroid/net/wifi/IScanResultsListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/IScanResultsListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/IScanResultsListener$Stub$Proxy;->onScanResultsAvailable()V
-Landroid/net/wifi/IScanResultsListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IScanResultsListener;
 Landroid/net/wifi/IScanResultsListener$Stub;-><init>()V
 Landroid/net/wifi/IScanResultsListener$Stub;->TRANSACTION_onScanResultsAvailable:I
 Landroid/net/wifi/IScanResultsListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IScanResultsListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IScanResultsListener;
-Landroid/net/wifi/IScanResultsListener$Stub;->getDefaultImpl()Landroid/net/wifi/IScanResultsListener;
 Landroid/net/wifi/IScanResultsListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/IScanResultsListener$Stub;->setDefaultImpl(Landroid/net/wifi/IScanResultsListener;)Z
 Landroid/net/wifi/IScanResultsListener;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/IScanResultsListener;->onScanResultsAvailable()V
 Landroid/net/wifi/IScoreUpdateObserver$Default;-><init>()V
@@ -371,7 +592,6 @@
 Landroid/net/wifi/IScoreUpdateObserver$Stub$Proxy;->notifyScoreUpdate(II)V
 Landroid/net/wifi/IScoreUpdateObserver$Stub$Proxy;->notifyStatusUpdate(IZ)V
 Landroid/net/wifi/IScoreUpdateObserver$Stub$Proxy;->requestNudOperation(I)V
-Landroid/net/wifi/IScoreUpdateObserver$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IScoreUpdateObserver;
 Landroid/net/wifi/IScoreUpdateObserver$Stub$Proxy;->triggerUpdateOfWifiUsabilityStats(I)V
 Landroid/net/wifi/IScoreUpdateObserver$Stub;-><init>()V
 Landroid/net/wifi/IScoreUpdateObserver$Stub;->TRANSACTION_blocklistCurrentBssid:I
@@ -381,9 +601,7 @@
 Landroid/net/wifi/IScoreUpdateObserver$Stub;->TRANSACTION_triggerUpdateOfWifiUsabilityStats:I
 Landroid/net/wifi/IScoreUpdateObserver$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IScoreUpdateObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IScoreUpdateObserver;
-Landroid/net/wifi/IScoreUpdateObserver$Stub;->getDefaultImpl()Landroid/net/wifi/IScoreUpdateObserver;
 Landroid/net/wifi/IScoreUpdateObserver$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/IScoreUpdateObserver$Stub;->setDefaultImpl(Landroid/net/wifi/IScoreUpdateObserver;)Z
 Landroid/net/wifi/IScoreUpdateObserver;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/IScoreUpdateObserver;->blocklistCurrentBssid(I)V
 Landroid/net/wifi/IScoreUpdateObserver;->notifyScoreUpdate(II)V
@@ -420,7 +638,6 @@
 Landroid/net/wifi/ISoftApCallback$Stub$Proxy;->onCapabilityChanged(Landroid/net/wifi/SoftApCapability;)V
 Landroid/net/wifi/ISoftApCallback$Stub$Proxy;->onConnectedClientsOrInfoChanged(Ljava/util/Map;Ljava/util/Map;ZZ)V
 Landroid/net/wifi/ISoftApCallback$Stub$Proxy;->onStateChanged(II)V
-Landroid/net/wifi/ISoftApCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ISoftApCallback;
 Landroid/net/wifi/ISoftApCallback$Stub;-><init>()V
 Landroid/net/wifi/ISoftApCallback$Stub;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/ISoftApCallback$Stub;->TRANSACTION_onBlockedClientConnecting:I
@@ -429,11 +646,9 @@
 Landroid/net/wifi/ISoftApCallback$Stub;->TRANSACTION_onStateChanged:I
 Landroid/net/wifi/ISoftApCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/ISoftApCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ISoftApCallback;
-Landroid/net/wifi/ISoftApCallback$Stub;->getDefaultImpl()Landroid/net/wifi/ISoftApCallback;
 Landroid/net/wifi/ISoftApCallback$Stub;->lambda$onTransact$0(Landroid/os/Parcel;Ljava/util/Map;I)V
 Landroid/net/wifi/ISoftApCallback$Stub;->lambda$onTransact$1(Landroid/os/Parcel;Ljava/util/Map;I)V
 Landroid/net/wifi/ISoftApCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/ISoftApCallback$Stub;->setDefaultImpl(Landroid/net/wifi/ISoftApCallback;)Z
 Landroid/net/wifi/ISoftApCallback;->onBlockedClientConnecting(Landroid/net/wifi/WifiClient;I)V
 Landroid/net/wifi/ISoftApCallback;->onCapabilityChanged(Landroid/net/wifi/SoftApCapability;)V
 Landroid/net/wifi/ISoftApCallback;->onConnectedClientsOrInfoChanged(Ljava/util/Map;Ljava/util/Map;ZZ)V
@@ -448,15 +663,12 @@
 Landroid/net/wifi/ISubsystemRestartCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/ISubsystemRestartCallback$Stub$Proxy;->onSubsystemRestarted()V
 Landroid/net/wifi/ISubsystemRestartCallback$Stub$Proxy;->onSubsystemRestarting()V
-Landroid/net/wifi/ISubsystemRestartCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ISubsystemRestartCallback;
 Landroid/net/wifi/ISubsystemRestartCallback$Stub;-><init>()V
 Landroid/net/wifi/ISubsystemRestartCallback$Stub;->TRANSACTION_onSubsystemRestarted:I
 Landroid/net/wifi/ISubsystemRestartCallback$Stub;->TRANSACTION_onSubsystemRestarting:I
 Landroid/net/wifi/ISubsystemRestartCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/ISubsystemRestartCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ISubsystemRestartCallback;
-Landroid/net/wifi/ISubsystemRestartCallback$Stub;->getDefaultImpl()Landroid/net/wifi/ISubsystemRestartCallback;
 Landroid/net/wifi/ISubsystemRestartCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/ISubsystemRestartCallback$Stub;->setDefaultImpl(Landroid/net/wifi/ISubsystemRestartCallback;)Z
 Landroid/net/wifi/ISubsystemRestartCallback;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/ISubsystemRestartCallback;->onSubsystemRestarted()V
 Landroid/net/wifi/ISubsystemRestartCallback;->onSubsystemRestarting()V
@@ -468,14 +680,11 @@
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub$Proxy;->onConnectionStatus(Landroid/net/wifi/WifiNetworkSuggestion;I)V
-Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ISuggestionConnectionStatusListener;
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;-><init>()V
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;->TRANSACTION_onConnectionStatus:I
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ISuggestionConnectionStatusListener;
-Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;->getDefaultImpl()Landroid/net/wifi/ISuggestionConnectionStatusListener;
 Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/ISuggestionConnectionStatusListener$Stub;->setDefaultImpl(Landroid/net/wifi/ISuggestionConnectionStatusListener;)Z
 Landroid/net/wifi/ISuggestionConnectionStatusListener;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/ISuggestionConnectionStatusListener;->onConnectionStatus(Landroid/net/wifi/WifiNetworkSuggestion;I)V
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Default;-><init>()V
@@ -486,14 +695,11 @@
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub$Proxy;->onUserApprovalStatusChange(I)V
-Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ISuggestionUserApprovalStatusListener;
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;-><init>()V
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;->TRANSACTION_onUserApprovalStatusChange:I
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ISuggestionUserApprovalStatusListener;
-Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;->getDefaultImpl()Landroid/net/wifi/ISuggestionUserApprovalStatusListener;
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/ISuggestionUserApprovalStatusListener$Stub;->setDefaultImpl(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;)Z
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/ISuggestionUserApprovalStatusListener;->onUserApprovalStatusChange(I)V
 Landroid/net/wifi/ITrafficStateCallback$Default;-><init>()V
@@ -504,14 +710,11 @@
 Landroid/net/wifi/ITrafficStateCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/ITrafficStateCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/ITrafficStateCallback$Stub$Proxy;->onStateChanged(I)V
-Landroid/net/wifi/ITrafficStateCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/ITrafficStateCallback;
 Landroid/net/wifi/ITrafficStateCallback$Stub;-><init>()V
 Landroid/net/wifi/ITrafficStateCallback$Stub;->TRANSACTION_onStateChanged:I
 Landroid/net/wifi/ITrafficStateCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/ITrafficStateCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/ITrafficStateCallback;
-Landroid/net/wifi/ITrafficStateCallback$Stub;->getDefaultImpl()Landroid/net/wifi/ITrafficStateCallback;
 Landroid/net/wifi/ITrafficStateCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/ITrafficStateCallback$Stub;->setDefaultImpl(Landroid/net/wifi/ITrafficStateCallback;)Z
 Landroid/net/wifi/ITrafficStateCallback;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/ITrafficStateCallback;->onStateChanged(I)V
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Default;-><init>()V
@@ -526,16 +729,13 @@
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub$Proxy;->onSetScoreUpdateObserver(Landroid/net/wifi/IScoreUpdateObserver;)V
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub$Proxy;->onStart(Landroid/net/wifi/WifiConnectedSessionInfo;)V
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub$Proxy;->onStop(I)V
-Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IWifiConnectedNetworkScorer;
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;-><init>()V
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->TRANSACTION_onSetScoreUpdateObserver:I
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->TRANSACTION_onStart:I
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->TRANSACTION_onStop:I
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiConnectedNetworkScorer;
-Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->getDefaultImpl()Landroid/net/wifi/IWifiConnectedNetworkScorer;
 Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/IWifiConnectedNetworkScorer$Stub;->setDefaultImpl(Landroid/net/wifi/IWifiConnectedNetworkScorer;)Z
 Landroid/net/wifi/IWifiConnectedNetworkScorer;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/IWifiConnectedNetworkScorer;->onSetScoreUpdateObserver(Landroid/net/wifi/IScoreUpdateObserver;)V
 Landroid/net/wifi/IWifiConnectedNetworkScorer;->onStart(Landroid/net/wifi/WifiConnectedSessionInfo;)V
@@ -543,9 +743,10 @@
 Landroid/net/wifi/IWifiManager$Default;-><init>()V
 Landroid/net/wifi/IWifiManager$Default;->acquireMulticastLock(Landroid/os/IBinder;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Default;->acquireWifiLock(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/WorkSource;)Z
+Landroid/net/wifi/IWifiManager$Default;->addCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[BLjava/util/List;)V
 Landroid/net/wifi/IWifiManager$Default;->addNetworkSuggestions(Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)I
 Landroid/net/wifi/IWifiManager$Default;->addOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V
-Landroid/net/wifi/IWifiManager$Default;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)I
+Landroid/net/wifi/IWifiManager$Default;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;Landroid/os/Bundle;)I
 Landroid/net/wifi/IWifiManager$Default;->addOrUpdateNetworkPrivileged(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Landroid/net/wifi/WifiManager$AddNetworkResult;
 Landroid/net/wifi/IWifiManager$Default;->addOrUpdatePasspointConfiguration(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Default;->addSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V
@@ -555,9 +756,10 @@
 Landroid/net/wifi/IWifiManager$Default;->allowAutojoinPasspoint(Ljava/lang/String;Z)V
 Landroid/net/wifi/IWifiManager$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IWifiManager$Default;->calculateSignalLevel(I)I
+Landroid/net/wifi/IWifiManager$Default;->clearExternalPnoScanRequest()V
 Landroid/net/wifi/IWifiManager$Default;->clearOverrideCountryCode()V
 Landroid/net/wifi/IWifiManager$Default;->clearWifiConnectedNetworkScorer()V
-Landroid/net/wifi/IWifiManager$Default;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;)V
+Landroid/net/wifi/IWifiManager$Default;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Default;->disableEphemeralNetwork(Ljava/lang/String;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Default;->disableNetwork(ILjava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Default;->disconnect(Ljava/lang/String;)Z
@@ -572,19 +774,24 @@
 Landroid/net/wifi/IWifiManager$Default;->getAllMatchingPasspointProfilesForScanResults(Ljava/util/List;)Ljava/util/Map;
 Landroid/net/wifi/IWifiManager$Default;->getConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Z)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;
 Landroid/net/wifi/IWifiManager$Default;->getConnectionInfo(Ljava/lang/String;Ljava/lang/String;)Landroid/net/wifi/WifiInfo;
-Landroid/net/wifi/IWifiManager$Default;->getCountryCode()Ljava/lang/String;
+Landroid/net/wifi/IWifiManager$Default;->getCountryCode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 Landroid/net/wifi/IWifiManager$Default;->getCurrentNetwork()Landroid/net/Network;
 Landroid/net/wifi/IWifiManager$Default;->getCurrentNetworkWpsNfcConfigurationToken()Ljava/lang/String;
 Landroid/net/wifi/IWifiManager$Default;->getDhcpInfo(Ljava/lang/String;)Landroid/net/DhcpInfo;
 Landroid/net/wifi/IWifiManager$Default;->getFactoryMacAddresses()[Ljava/lang/String;
+Landroid/net/wifi/IWifiManager$Default;->getLastCallerInfoForApi(ILandroid/net/wifi/ILastCallerListener;)V
 Landroid/net/wifi/IWifiManager$Default;->getMatchingOsuProviders(Ljava/util/List;)Ljava/util/Map;
 Landroid/net/wifi/IWifiManager$Default;->getMatchingPasspointConfigsForOsuProviders(Ljava/util/List;)Ljava/util/Map;
 Landroid/net/wifi/IWifiManager$Default;->getMatchingScanResults(Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map;
 Landroid/net/wifi/IWifiManager$Default;->getNetworkSuggestions(Ljava/lang/String;)Ljava/util/List;
+Landroid/net/wifi/IWifiManager$Default;->getOemPrivilegedWifiAdminPackages()[Ljava/lang/String;
 Landroid/net/wifi/IWifiManager$Default;->getPasspointConfigurations(Ljava/lang/String;)Ljava/util/List;
-Landroid/net/wifi/IWifiManager$Default;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;
+Landroid/net/wifi/IWifiManager$Default;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;
+Landroid/net/wifi/IWifiManager$Default;->getPrivilegedConnectedNetwork(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/net/wifi/WifiConfiguration;
 Landroid/net/wifi/IWifiManager$Default;->getScanResults(Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
 Landroid/net/wifi/IWifiManager$Default;->getSoftApConfiguration()Landroid/net/wifi/SoftApConfiguration;
+Landroid/net/wifi/IWifiManager$Default;->getSsidsAllowlist(Ljava/lang/String;)Ljava/util/List;
+Landroid/net/wifi/IWifiManager$Default;->getStaConcurrencyForMultiInternetMode()I
 Landroid/net/wifi/IWifiManager$Default;->getSupportedFeatures()J
 Landroid/net/wifi/IWifiManager$Default;->getUsableChannels(III)Ljava/util/List;
 Landroid/net/wifi/IWifiManager$Default;->getVerboseLoggingLevel()I
@@ -605,13 +812,19 @@
 Landroid/net/wifi/IWifiManager$Default;->isMulticastEnabled()Z
 Landroid/net/wifi/IWifiManager$Default;->isScanAlwaysAvailable()Z
 Landroid/net/wifi/IWifiManager$Default;->isScanThrottleEnabled()Z
+Landroid/net/wifi/IWifiManager$Default;->isWifiPasspointEnabled()Z
 Landroid/net/wifi/IWifiManager$Default;->isWifiStandardSupported(I)Z
 Landroid/net/wifi/IWifiManager$Default;->matchProviderWithCurrentNetwork(Ljava/lang/String;)I
+Landroid/net/wifi/IWifiManager$Default;->notifyMinimumRequiredWifiSecurityLevelChanged(I)V
 Landroid/net/wifi/IWifiManager$Default;->notifyUserOfApBandConversion(Ljava/lang/String;)V
+Landroid/net/wifi/IWifiManager$Default;->notifyWifiSsidPolicyChanged(ILjava/util/List;)V
+Landroid/net/wifi/IWifiManager$Default;->queryAutojoinGlobal(Landroid/net/wifi/IBooleanListener;)V
 Landroid/net/wifi/IWifiManager$Default;->queryPasspointIcon(JLjava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Default;->reassociate(Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Default;->reconnect(Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Default;->registerCoexCallback(Landroid/net/wifi/ICoexCallback;)V
+Landroid/net/wifi/IWifiManager$Default;->registerDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;Ljava/lang/String;Ljava/lang/String;)V
+Landroid/net/wifi/IWifiManager$Default;->registerLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V
 Landroid/net/wifi/IWifiManager$Default;->registerNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V
 Landroid/net/wifi/IWifiManager$Default;->registerScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V
 Landroid/net/wifi/IWifiManager$Default;->registerSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V
@@ -621,40 +834,50 @@
 Landroid/net/wifi/IWifiManager$Default;->releaseMulticastLock(Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Default;->releaseWifiLock(Landroid/os/IBinder;)Z
 Landroid/net/wifi/IWifiManager$Default;->removeAppState(ILjava/lang/String;)V
+Landroid/net/wifi/IWifiManager$Default;->removeCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[B)V
 Landroid/net/wifi/IWifiManager$Default;->removeNetwork(ILjava/lang/String;)Z
-Landroid/net/wifi/IWifiManager$Default;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;)I
+Landroid/net/wifi/IWifiManager$Default;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;I)I
 Landroid/net/wifi/IWifiManager$Default;->removeNonCallerConfiguredNetworks(Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Default;->removeOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V
 Landroid/net/wifi/IWifiManager$Default;->removePasspointConfiguration(Ljava/lang/String;Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Default;->removeSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Default;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;)V
+Landroid/net/wifi/IWifiManager$Default;->replyToP2pInvitationReceivedDialog(IZLjava/lang/String;)V
+Landroid/net/wifi/IWifiManager$Default;->replyToSimpleDialog(II)V
+Landroid/net/wifi/IWifiManager$Default;->reportCreateInterfaceImpact(Ljava/lang/String;IZLandroid/net/wifi/IInterfaceCreationInfoCallback;)V
 Landroid/net/wifi/IWifiManager$Default;->restartWifiSubsystem()V
 Landroid/net/wifi/IWifiManager$Default;->restoreBackupData([B)V
 Landroid/net/wifi/IWifiManager$Default;->restoreSoftApBackupData([B)Landroid/net/wifi/SoftApConfiguration;
 Landroid/net/wifi/IWifiManager$Default;->restoreSupplicantBackupData([B[B)V
 Landroid/net/wifi/IWifiManager$Default;->retrieveBackupData()[B
 Landroid/net/wifi/IWifiManager$Default;->retrieveSoftApBackupData()[B
-Landroid/net/wifi/IWifiManager$Default;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;)V
+Landroid/net/wifi/IWifiManager$Default;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Default;->setAutoWakeupEnabled(Z)V
 Landroid/net/wifi/IWifiManager$Default;->setCarrierNetworkOffloadEnabled(IZZ)V
 Landroid/net/wifi/IWifiManager$Default;->setCoexUnsafeChannels(Ljava/util/List;I)V
 Landroid/net/wifi/IWifiManager$Default;->setDefaultCountryCode(Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Default;->setDeviceMobilityState(I)V
 Landroid/net/wifi/IWifiManager$Default;->setEmergencyScanRequestInProgress(Z)V
+Landroid/net/wifi/IWifiManager$Default;->setExternalPnoScanRequest(Landroid/os/IBinder;Landroid/net/wifi/IPnoScanResultsCallback;Ljava/util/List;[ILjava/lang/String;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Default;->setMacRandomizationSettingPasspointEnabled(Ljava/lang/String;Z)V
+Landroid/net/wifi/IWifiManager$Default;->setOneShotScreenOnConnectivityScanDelayMillis(I)V
 Landroid/net/wifi/IWifiManager$Default;->setOverrideCountryCode(Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Default;->setPasspointMeteredOverride(Ljava/lang/String;I)V
 Landroid/net/wifi/IWifiManager$Default;->setScanAlwaysAvailable(ZLjava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Default;->setScanThrottleEnabled(Z)V
+Landroid/net/wifi/IWifiManager$Default;->setScreenOnScanSchedule([I[I)V
 Landroid/net/wifi/IWifiManager$Default;->setSoftApConfiguration(Landroid/net/wifi/SoftApConfiguration;Ljava/lang/String;)Z
+Landroid/net/wifi/IWifiManager$Default;->setSsidsAllowlist(Ljava/lang/String;Ljava/util/List;)V
+Landroid/net/wifi/IWifiManager$Default;->setStaConcurrencyForMultiInternetMode(I)Z
 Landroid/net/wifi/IWifiManager$Default;->setWifiApConfiguration(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Default;->setWifiConnectedNetworkScorer(Landroid/os/IBinder;Landroid/net/wifi/IWifiConnectedNetworkScorer;)Z
 Landroid/net/wifi/IWifiManager$Default;->setWifiEnabled(Ljava/lang/String;Z)Z
+Landroid/net/wifi/IWifiManager$Default;->setWifiPasspointEnabled(Z)V
 Landroid/net/wifi/IWifiManager$Default;->setWifiScoringEnabled(Z)Z
 Landroid/net/wifi/IWifiManager$Default;->startDppAsConfiguratorInitiator(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;IILandroid/net/wifi/IDppCallback;)V
 Landroid/net/wifi/IWifiManager$Default;->startDppAsEnrolleeInitiator(Landroid/os/IBinder;Ljava/lang/String;Landroid/net/wifi/IDppCallback;)V
 Landroid/net/wifi/IWifiManager$Default;->startDppAsEnrolleeResponder(Landroid/os/IBinder;Ljava/lang/String;ILandroid/net/wifi/IDppCallback;)V
-Landroid/net/wifi/IWifiManager$Default;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;)I
+Landroid/net/wifi/IWifiManager$Default;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;Landroid/os/Bundle;)I
 Landroid/net/wifi/IWifiManager$Default;->startRestrictingAutoJoinToSubscriptionId(I)V
 Landroid/net/wifi/IWifiManager$Default;->startScan(Ljava/lang/String;Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Default;->startSoftAp(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z
@@ -667,6 +890,8 @@
 Landroid/net/wifi/IWifiManager$Default;->stopSoftAp()Z
 Landroid/net/wifi/IWifiManager$Default;->stopWatchLocalOnlyHotspot()V
 Landroid/net/wifi/IWifiManager$Default;->unregisterCoexCallback(Landroid/net/wifi/ICoexCallback;)V
+Landroid/net/wifi/IWifiManager$Default;->unregisterDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;)V
+Landroid/net/wifi/IWifiManager$Default;->unregisterLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V
 Landroid/net/wifi/IWifiManager$Default;->unregisterNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V
 Landroid/net/wifi/IWifiManager$Default;->unregisterScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V
 Landroid/net/wifi/IWifiManager$Default;->unregisterSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V
@@ -679,9 +904,10 @@
 Landroid/net/wifi/IWifiManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->acquireMulticastLock(Landroid/os/IBinder;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->acquireWifiLock(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/WorkSource;)Z
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->addCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[BLjava/util/List;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->addNetworkSuggestions(Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)I
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->addOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)I
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;Landroid/os/Bundle;)I
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->addOrUpdateNetworkPrivileged(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Landroid/net/wifi/WifiManager$AddNetworkResult;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->addOrUpdatePasspointConfiguration(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->addSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V
@@ -691,9 +917,10 @@
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->allowAutojoinPasspoint(Ljava/lang/String;Z)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->calculateSignalLevel(I)I
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->clearExternalPnoScanRequest()V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->clearOverrideCountryCode()V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->clearWifiConnectedNetworkScorer()V
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->disableEphemeralNetwork(Ljava/lang/String;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->disableNetwork(ILjava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->disconnect(Ljava/lang/String;)Z
@@ -708,20 +935,25 @@
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getAllMatchingPasspointProfilesForScanResults(Ljava/util/List;)Ljava/util/Map;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Z)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getConnectionInfo(Ljava/lang/String;Ljava/lang/String;)Landroid/net/wifi/WifiInfo;
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->getCountryCode()Ljava/lang/String;
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getCountryCode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getCurrentNetwork()Landroid/net/Network;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getCurrentNetworkWpsNfcConfigurationToken()Ljava/lang/String;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getDhcpInfo(Ljava/lang/String;)Landroid/net/DhcpInfo;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getFactoryMacAddresses()[Ljava/lang/String;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getLastCallerInfoForApi(ILandroid/net/wifi/ILastCallerListener;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getMatchingOsuProviders(Ljava/util/List;)Ljava/util/Map;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getMatchingPasspointConfigsForOsuProviders(Ljava/util/List;)Ljava/util/Map;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getMatchingScanResults(Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getNetworkSuggestions(Ljava/lang/String;)Ljava/util/List;
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getOemPrivilegedWifiAdminPackages()[Ljava/lang/String;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getPasspointConfigurations(Ljava/lang/String;)Ljava/util/List;
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getPrivilegedConnectedNetwork(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/net/wifi/WifiConfiguration;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getScanResults(Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getSoftApConfiguration()Landroid/net/wifi/SoftApConfiguration;
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getSsidsAllowlist(Ljava/lang/String;)Ljava/util/List;
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->getStaConcurrencyForMultiInternetMode()I
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getSupportedFeatures()J
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getUsableChannels(III)Ljava/util/List;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->getVerboseLoggingLevel()I
@@ -742,14 +974,20 @@
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->isMulticastEnabled()Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->isScanAlwaysAvailable()Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->isScanThrottleEnabled()Z
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->isWifiPasspointEnabled()Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->isWifiStandardSupported(I)Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->matchProviderWithCurrentNetwork(Ljava/lang/String;)I
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->notifyMinimumRequiredWifiSecurityLevelChanged(I)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->notifyUserOfApBandConversion(Ljava/lang/String;)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->notifyWifiSsidPolicyChanged(ILjava/util/List;)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->queryAutojoinGlobal(Landroid/net/wifi/IBooleanListener;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->queryPasspointIcon(JLjava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->reassociate(Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->reconnect(Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->registerCoexCallback(Landroid/net/wifi/ICoexCallback;)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->registerDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;Ljava/lang/String;Ljava/lang/String;)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->registerLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->registerNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->registerScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->registerSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V
@@ -759,41 +997,50 @@
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->releaseMulticastLock(Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->releaseWifiLock(Landroid/os/IBinder;)Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeAppState(ILjava/lang/String;)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[B)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeNetwork(ILjava/lang/String;)Z
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;)I
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;I)I
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeNonCallerConfiguredNetworks(Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removePasspointConfiguration(Ljava/lang/String;Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->replyToP2pInvitationReceivedDialog(IZLjava/lang/String;)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->replyToSimpleDialog(II)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->reportCreateInterfaceImpact(Ljava/lang/String;IZLandroid/net/wifi/IInterfaceCreationInfoCallback;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->restartWifiSubsystem()V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->restoreBackupData([B)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->restoreSoftApBackupData([B)Landroid/net/wifi/SoftApConfiguration;
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->restoreSupplicantBackupData([B[B)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->retrieveBackupData()[B
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->retrieveSoftApBackupData()[B
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IWifiManager;
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setAutoWakeupEnabled(Z)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setCarrierNetworkOffloadEnabled(IZZ)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setCoexUnsafeChannels(Ljava/util/List;I)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setDefaultCountryCode(Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setDeviceMobilityState(I)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setEmergencyScanRequestInProgress(Z)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->setExternalPnoScanRequest(Landroid/os/IBinder;Landroid/net/wifi/IPnoScanResultsCallback;Ljava/util/List;[ILjava/lang/String;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setMacRandomizationSettingPasspointEnabled(Ljava/lang/String;Z)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->setOneShotScreenOnConnectivityScanDelayMillis(I)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setOverrideCountryCode(Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setPasspointMeteredOverride(Ljava/lang/String;I)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setScanAlwaysAvailable(ZLjava/lang/String;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setScanThrottleEnabled(Z)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->setScreenOnScanSchedule([I[I)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setSoftApConfiguration(Landroid/net/wifi/SoftApConfiguration;Ljava/lang/String;)Z
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->setSsidsAllowlist(Ljava/lang/String;Ljava/util/List;)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->setStaConcurrencyForMultiInternetMode(I)Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setWifiApConfiguration(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setWifiConnectedNetworkScorer(Landroid/os/IBinder;Landroid/net/wifi/IWifiConnectedNetworkScorer;)Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setWifiEnabled(Ljava/lang/String;Z)Z
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->setWifiPasspointEnabled(Z)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->setWifiScoringEnabled(Z)Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->startDppAsConfiguratorInitiator(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;IILandroid/net/wifi/IDppCallback;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->startDppAsEnrolleeInitiator(Landroid/os/IBinder;Ljava/lang/String;Landroid/net/wifi/IDppCallback;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->startDppAsEnrolleeResponder(Landroid/os/IBinder;Ljava/lang/String;ILandroid/net/wifi/IDppCallback;)V
-Landroid/net/wifi/IWifiManager$Stub$Proxy;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;)I
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;Landroid/os/Bundle;)I
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->startRestrictingAutoJoinToSubscriptionId(I)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->startScan(Ljava/lang/String;Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->startSoftAp(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z
@@ -806,6 +1053,8 @@
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->stopSoftAp()Z
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->stopWatchLocalOnlyHotspot()V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->unregisterCoexCallback(Landroid/net/wifi/ICoexCallback;)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->unregisterDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;)V
+Landroid/net/wifi/IWifiManager$Stub$Proxy;->unregisterLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->unregisterNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->unregisterScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V
 Landroid/net/wifi/IWifiManager$Stub$Proxy;->unregisterSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V
@@ -819,6 +1068,7 @@
 Landroid/net/wifi/IWifiManager$Stub;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_acquireMulticastLock:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_acquireWifiLock:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_addCustomDhcpOptions:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_addNetworkSuggestions:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_addOnWifiUsabilityStatsListener:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_addOrUpdateNetwork:I
@@ -830,6 +1080,7 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_allowAutojoinGlobal:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_allowAutojoinPasspoint:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_calculateSignalLevel:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_clearExternalPnoScanRequest:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_clearOverrideCountryCode:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_clearWifiConnectedNetworkScorer:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_connect:I
@@ -852,14 +1103,19 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getCurrentNetworkWpsNfcConfigurationToken:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getDhcpInfo:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getFactoryMacAddresses:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getLastCallerInfoForApi:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getMatchingOsuProviders:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getMatchingPasspointConfigsForOsuProviders:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getMatchingScanResults:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getNetworkSuggestions:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getOemPrivilegedWifiAdminPackages:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getPasspointConfigurations:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getPrivilegedConfiguredNetworks:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getPrivilegedConnectedNetwork:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getScanResults:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getSoftApConfiguration:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getSsidsAllowlist:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getStaConcurrencyForMultiInternetMode:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getSupportedFeatures:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getUsableChannels:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getVerboseLoggingLevel:I
@@ -880,13 +1136,19 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_isMulticastEnabled:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_isScanAlwaysAvailable:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_isScanThrottleEnabled:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_isWifiPasspointEnabled:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_isWifiStandardSupported:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_matchProviderWithCurrentNetwork:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_notifyMinimumRequiredWifiSecurityLevelChanged:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_notifyUserOfApBandConversion:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_notifyWifiSsidPolicyChanged:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_queryAutojoinGlobal:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_queryPasspointIcon:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_reassociate:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_reconnect:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_registerCoexCallback:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_registerDriverCountryCodeChangedListener:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_registerLocalOnlyHotspotSoftApCallback:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_registerNetworkRequestMatchCallback:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_registerScanResultsCallback:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_registerSoftApCallback:I
@@ -896,6 +1158,7 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_releaseMulticastLock:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_releaseWifiLock:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeAppState:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeCustomDhcpOptions:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeNetwork:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeNetworkSuggestions:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeNonCallerConfiguredNetworks:I
@@ -903,6 +1166,9 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removePasspointConfiguration:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeSuggestionUserApprovalStatusListener:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_removeWifiVerboseLoggingStatusChangedListener:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_replyToP2pInvitationReceivedDialog:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_replyToSimpleDialog:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_reportCreateInterfaceImpact:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_restartWifiSubsystem:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_restoreBackupData:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_restoreSoftApBackupData:I
@@ -916,15 +1182,21 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setDefaultCountryCode:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setDeviceMobilityState:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setEmergencyScanRequestInProgress:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setExternalPnoScanRequest:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setMacRandomizationSettingPasspointEnabled:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setOneShotScreenOnConnectivityScanDelayMillis:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setOverrideCountryCode:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setPasspointMeteredOverride:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setScanAlwaysAvailable:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setScanThrottleEnabled:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setScreenOnScanSchedule:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setSoftApConfiguration:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setSsidsAllowlist:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setStaConcurrencyForMultiInternetMode:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setWifiApConfiguration:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setWifiConnectedNetworkScorer:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setWifiEnabled:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setWifiPasspointEnabled:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_setWifiScoringEnabled:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_startDppAsConfiguratorInitiator:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_startDppAsEnrolleeInitiator:I
@@ -942,6 +1214,8 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_stopSoftAp:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_stopWatchLocalOnlyHotspot:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_unregisterCoexCallback:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_unregisterDriverCountryCodeChangedListener:I
+Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_unregisterLocalOnlyHotspotSoftApCallback:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_unregisterNetworkRequestMatchCallback:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_unregisterScanResultsCallback:I
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_unregisterSoftApCallback:I
@@ -953,14 +1227,13 @@
 Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_updateWifiUsabilityScore:I
 Landroid/net/wifi/IWifiManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IWifiManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiManager;
-Landroid/net/wifi/IWifiManager$Stub;->getDefaultImpl()Landroid/net/wifi/IWifiManager;
 Landroid/net/wifi/IWifiManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/IWifiManager$Stub;->setDefaultImpl(Landroid/net/wifi/IWifiManager;)Z
 Landroid/net/wifi/IWifiManager;->acquireMulticastLock(Landroid/os/IBinder;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager;->acquireWifiLock(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/WorkSource;)Z
+Landroid/net/wifi/IWifiManager;->addCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[BLjava/util/List;)V
 Landroid/net/wifi/IWifiManager;->addNetworkSuggestions(Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)I
 Landroid/net/wifi/IWifiManager;->addOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V
-Landroid/net/wifi/IWifiManager;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)I
+Landroid/net/wifi/IWifiManager;->addOrUpdateNetwork(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;Landroid/os/Bundle;)I
 Landroid/net/wifi/IWifiManager;->addOrUpdateNetworkPrivileged(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Landroid/net/wifi/WifiManager$AddNetworkResult;
 Landroid/net/wifi/IWifiManager;->addOrUpdatePasspointConfiguration(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager;->addSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V
@@ -969,9 +1242,10 @@
 Landroid/net/wifi/IWifiManager;->allowAutojoinGlobal(Z)V
 Landroid/net/wifi/IWifiManager;->allowAutojoinPasspoint(Ljava/lang/String;Z)V
 Landroid/net/wifi/IWifiManager;->calculateSignalLevel(I)I
+Landroid/net/wifi/IWifiManager;->clearExternalPnoScanRequest()V
 Landroid/net/wifi/IWifiManager;->clearOverrideCountryCode()V
 Landroid/net/wifi/IWifiManager;->clearWifiConnectedNetworkScorer()V
-Landroid/net/wifi/IWifiManager;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;)V
+Landroid/net/wifi/IWifiManager;->connect(Landroid/net/wifi/WifiConfiguration;ILandroid/net/wifi/IActionListener;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager;->disableEphemeralNetwork(Ljava/lang/String;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager;->disableNetwork(ILjava/lang/String;)Z
 Landroid/net/wifi/IWifiManager;->disconnect(Ljava/lang/String;)Z
@@ -986,19 +1260,24 @@
 Landroid/net/wifi/IWifiManager;->getAllMatchingPasspointProfilesForScanResults(Ljava/util/List;)Ljava/util/Map;
 Landroid/net/wifi/IWifiManager;->getConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Z)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;
 Landroid/net/wifi/IWifiManager;->getConnectionInfo(Ljava/lang/String;Ljava/lang/String;)Landroid/net/wifi/WifiInfo;
-Landroid/net/wifi/IWifiManager;->getCountryCode()Ljava/lang/String;
+Landroid/net/wifi/IWifiManager;->getCountryCode(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 Landroid/net/wifi/IWifiManager;->getCurrentNetwork()Landroid/net/Network;
 Landroid/net/wifi/IWifiManager;->getCurrentNetworkWpsNfcConfigurationToken()Ljava/lang/String;
 Landroid/net/wifi/IWifiManager;->getDhcpInfo(Ljava/lang/String;)Landroid/net/DhcpInfo;
 Landroid/net/wifi/IWifiManager;->getFactoryMacAddresses()[Ljava/lang/String;
+Landroid/net/wifi/IWifiManager;->getLastCallerInfoForApi(ILandroid/net/wifi/ILastCallerListener;)V
 Landroid/net/wifi/IWifiManager;->getMatchingOsuProviders(Ljava/util/List;)Ljava/util/Map;
 Landroid/net/wifi/IWifiManager;->getMatchingPasspointConfigsForOsuProviders(Ljava/util/List;)Ljava/util/Map;
 Landroid/net/wifi/IWifiManager;->getMatchingScanResults(Ljava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map;
 Landroid/net/wifi/IWifiManager;->getNetworkSuggestions(Ljava/lang/String;)Ljava/util/List;
+Landroid/net/wifi/IWifiManager;->getOemPrivilegedWifiAdminPackages()[Ljava/lang/String;
 Landroid/net/wifi/IWifiManager;->getPasspointConfigurations(Ljava/lang/String;)Ljava/util/List;
-Landroid/net/wifi/IWifiManager;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;
+Landroid/net/wifi/IWifiManager;->getPrivilegedConfiguredNetworks(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;
+Landroid/net/wifi/IWifiManager;->getPrivilegedConnectedNetwork(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/net/wifi/WifiConfiguration;
 Landroid/net/wifi/IWifiManager;->getScanResults(Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
 Landroid/net/wifi/IWifiManager;->getSoftApConfiguration()Landroid/net/wifi/SoftApConfiguration;
+Landroid/net/wifi/IWifiManager;->getSsidsAllowlist(Ljava/lang/String;)Ljava/util/List;
+Landroid/net/wifi/IWifiManager;->getStaConcurrencyForMultiInternetMode()I
 Landroid/net/wifi/IWifiManager;->getSupportedFeatures()J
 Landroid/net/wifi/IWifiManager;->getUsableChannels(III)Ljava/util/List;
 Landroid/net/wifi/IWifiManager;->getVerboseLoggingLevel()I
@@ -1019,13 +1298,19 @@
 Landroid/net/wifi/IWifiManager;->isMulticastEnabled()Z
 Landroid/net/wifi/IWifiManager;->isScanAlwaysAvailable()Z
 Landroid/net/wifi/IWifiManager;->isScanThrottleEnabled()Z
+Landroid/net/wifi/IWifiManager;->isWifiPasspointEnabled()Z
 Landroid/net/wifi/IWifiManager;->isWifiStandardSupported(I)Z
 Landroid/net/wifi/IWifiManager;->matchProviderWithCurrentNetwork(Ljava/lang/String;)I
+Landroid/net/wifi/IWifiManager;->notifyMinimumRequiredWifiSecurityLevelChanged(I)V
 Landroid/net/wifi/IWifiManager;->notifyUserOfApBandConversion(Ljava/lang/String;)V
+Landroid/net/wifi/IWifiManager;->notifyWifiSsidPolicyChanged(ILjava/util/List;)V
+Landroid/net/wifi/IWifiManager;->queryAutojoinGlobal(Landroid/net/wifi/IBooleanListener;)V
 Landroid/net/wifi/IWifiManager;->queryPasspointIcon(JLjava/lang/String;)V
 Landroid/net/wifi/IWifiManager;->reassociate(Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager;->reconnect(Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager;->registerCoexCallback(Landroid/net/wifi/ICoexCallback;)V
+Landroid/net/wifi/IWifiManager;->registerDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;Ljava/lang/String;Ljava/lang/String;)V
+Landroid/net/wifi/IWifiManager;->registerLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V
 Landroid/net/wifi/IWifiManager;->registerNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V
 Landroid/net/wifi/IWifiManager;->registerScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V
 Landroid/net/wifi/IWifiManager;->registerSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V
@@ -1035,40 +1320,50 @@
 Landroid/net/wifi/IWifiManager;->releaseMulticastLock(Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager;->releaseWifiLock(Landroid/os/IBinder;)Z
 Landroid/net/wifi/IWifiManager;->removeAppState(ILjava/lang/String;)V
+Landroid/net/wifi/IWifiManager;->removeCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[B)V
 Landroid/net/wifi/IWifiManager;->removeNetwork(ILjava/lang/String;)Z
-Landroid/net/wifi/IWifiManager;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;)I
+Landroid/net/wifi/IWifiManager;->removeNetworkSuggestions(Ljava/util/List;Ljava/lang/String;I)I
 Landroid/net/wifi/IWifiManager;->removeNonCallerConfiguredNetworks(Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager;->removeOnWifiUsabilityStatsListener(Landroid/net/wifi/IOnWifiUsabilityStatsListener;)V
 Landroid/net/wifi/IWifiManager;->removePasspointConfiguration(Ljava/lang/String;Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager;->removeSuggestionUserApprovalStatusListener(Landroid/net/wifi/ISuggestionUserApprovalStatusListener;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;)V
+Landroid/net/wifi/IWifiManager;->replyToP2pInvitationReceivedDialog(IZLjava/lang/String;)V
+Landroid/net/wifi/IWifiManager;->replyToSimpleDialog(II)V
+Landroid/net/wifi/IWifiManager;->reportCreateInterfaceImpact(Ljava/lang/String;IZLandroid/net/wifi/IInterfaceCreationInfoCallback;)V
 Landroid/net/wifi/IWifiManager;->restartWifiSubsystem()V
 Landroid/net/wifi/IWifiManager;->restoreBackupData([B)V
 Landroid/net/wifi/IWifiManager;->restoreSoftApBackupData([B)Landroid/net/wifi/SoftApConfiguration;
 Landroid/net/wifi/IWifiManager;->restoreSupplicantBackupData([B[B)V
 Landroid/net/wifi/IWifiManager;->retrieveBackupData()[B
 Landroid/net/wifi/IWifiManager;->retrieveSoftApBackupData()[B
-Landroid/net/wifi/IWifiManager;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;)V
+Landroid/net/wifi/IWifiManager;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/IActionListener;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager;->setAutoWakeupEnabled(Z)V
 Landroid/net/wifi/IWifiManager;->setCarrierNetworkOffloadEnabled(IZZ)V
 Landroid/net/wifi/IWifiManager;->setCoexUnsafeChannels(Ljava/util/List;I)V
 Landroid/net/wifi/IWifiManager;->setDefaultCountryCode(Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager;->setDeviceMobilityState(I)V
 Landroid/net/wifi/IWifiManager;->setEmergencyScanRequestInProgress(Z)V
+Landroid/net/wifi/IWifiManager;->setExternalPnoScanRequest(Landroid/os/IBinder;Landroid/net/wifi/IPnoScanResultsCallback;Ljava/util/List;[ILjava/lang/String;Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager;->setMacRandomizationSettingPasspointEnabled(Ljava/lang/String;Z)V
+Landroid/net/wifi/IWifiManager;->setOneShotScreenOnConnectivityScanDelayMillis(I)V
 Landroid/net/wifi/IWifiManager;->setOverrideCountryCode(Ljava/lang/String;)V
 Landroid/net/wifi/IWifiManager;->setPasspointMeteredOverride(Ljava/lang/String;I)V
 Landroid/net/wifi/IWifiManager;->setScanAlwaysAvailable(ZLjava/lang/String;)V
 Landroid/net/wifi/IWifiManager;->setScanThrottleEnabled(Z)V
+Landroid/net/wifi/IWifiManager;->setScreenOnScanSchedule([I[I)V
 Landroid/net/wifi/IWifiManager;->setSoftApConfiguration(Landroid/net/wifi/SoftApConfiguration;Ljava/lang/String;)Z
+Landroid/net/wifi/IWifiManager;->setSsidsAllowlist(Ljava/lang/String;Ljava/util/List;)V
+Landroid/net/wifi/IWifiManager;->setStaConcurrencyForMultiInternetMode(I)Z
 Landroid/net/wifi/IWifiManager;->setWifiApConfiguration(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager;->setWifiConnectedNetworkScorer(Landroid/os/IBinder;Landroid/net/wifi/IWifiConnectedNetworkScorer;)Z
 Landroid/net/wifi/IWifiManager;->setWifiEnabled(Ljava/lang/String;Z)Z
+Landroid/net/wifi/IWifiManager;->setWifiPasspointEnabled(Z)V
 Landroid/net/wifi/IWifiManager;->setWifiScoringEnabled(Z)Z
 Landroid/net/wifi/IWifiManager;->startDppAsConfiguratorInitiator(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;IILandroid/net/wifi/IDppCallback;)V
 Landroid/net/wifi/IWifiManager;->startDppAsEnrolleeInitiator(Landroid/os/IBinder;Ljava/lang/String;Landroid/net/wifi/IDppCallback;)V
 Landroid/net/wifi/IWifiManager;->startDppAsEnrolleeResponder(Landroid/os/IBinder;Ljava/lang/String;ILandroid/net/wifi/IDppCallback;)V
-Landroid/net/wifi/IWifiManager;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;)I
+Landroid/net/wifi/IWifiManager;->startLocalOnlyHotspot(Landroid/net/wifi/ILocalOnlyHotspotCallback;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/SoftApConfiguration;Landroid/os/Bundle;)I
 Landroid/net/wifi/IWifiManager;->startRestrictingAutoJoinToSubscriptionId(I)V
 Landroid/net/wifi/IWifiManager;->startScan(Ljava/lang/String;Ljava/lang/String;)Z
 Landroid/net/wifi/IWifiManager;->startSoftAp(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Z
@@ -1081,6 +1376,8 @@
 Landroid/net/wifi/IWifiManager;->stopSoftAp()Z
 Landroid/net/wifi/IWifiManager;->stopWatchLocalOnlyHotspot()V
 Landroid/net/wifi/IWifiManager;->unregisterCoexCallback(Landroid/net/wifi/ICoexCallback;)V
+Landroid/net/wifi/IWifiManager;->unregisterDriverCountryCodeChangedListener(Landroid/net/wifi/IOnWifiDriverCountryCodeChangedListener;)V
+Landroid/net/wifi/IWifiManager;->unregisterLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/ISoftApCallback;Landroid/os/Bundle;)V
 Landroid/net/wifi/IWifiManager;->unregisterNetworkRequestMatchCallback(Landroid/net/wifi/INetworkRequestMatchCallback;)V
 Landroid/net/wifi/IWifiManager;->unregisterScanResultsCallback(Landroid/net/wifi/IScanResultsCallback;)V
 Landroid/net/wifi/IWifiManager;->unregisterSoftApCallback(Landroid/net/wifi/ISoftApCallback;)V
@@ -1094,24 +1391,25 @@
 Landroid/net/wifi/IWifiScanner$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IWifiScanner$Default;->getAvailableChannels(ILjava/lang/String;Ljava/lang/String;)Landroid/os/Bundle;
 Landroid/net/wifi/IWifiScanner$Default;->getMessenger()Landroid/os/Messenger;
+Landroid/net/wifi/IWifiScanner$Default;->isScanning()Z
 Landroid/net/wifi/IWifiScanner$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/net/wifi/IWifiScanner$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IWifiScanner$Stub$Proxy;->getAvailableChannels(ILjava/lang/String;Ljava/lang/String;)Landroid/os/Bundle;
 Landroid/net/wifi/IWifiScanner$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/IWifiScanner$Stub$Proxy;->getMessenger()Landroid/os/Messenger;
+Landroid/net/wifi/IWifiScanner$Stub$Proxy;->isScanning()Z
 Landroid/net/wifi/IWifiScanner$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/net/wifi/IWifiScanner$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IWifiScanner;
 Landroid/net/wifi/IWifiScanner$Stub;-><init>()V
 Landroid/net/wifi/IWifiScanner$Stub;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/IWifiScanner$Stub;->TRANSACTION_getAvailableChannels:I
 Landroid/net/wifi/IWifiScanner$Stub;->TRANSACTION_getMessenger:I
+Landroid/net/wifi/IWifiScanner$Stub;->TRANSACTION_isScanning:I
 Landroid/net/wifi/IWifiScanner$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IWifiScanner$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiScanner;
-Landroid/net/wifi/IWifiScanner$Stub;->getDefaultImpl()Landroid/net/wifi/IWifiScanner;
 Landroid/net/wifi/IWifiScanner$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/IWifiScanner$Stub;->setDefaultImpl(Landroid/net/wifi/IWifiScanner;)Z
 Landroid/net/wifi/IWifiScanner;->getAvailableChannels(ILjava/lang/String;Ljava/lang/String;)Landroid/os/Bundle;
 Landroid/net/wifi/IWifiScanner;->getMessenger()Landroid/os/Messenger;
+Landroid/net/wifi/IWifiScanner;->isScanning()Z
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Default;-><init>()V
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Default;->onStatusChanged(Z)V
@@ -1120,16 +1418,60 @@
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub$Proxy;->onStatusChanged(Z)V
-Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;-><init>()V
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->TRANSACTION_onStatusChanged:I
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;
-Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->getDefaultImpl()Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->setDefaultImpl(Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;)Z
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener;->onStatusChanged(Z)V
+Landroid/net/wifi/MloLink$1;-><init>()V
+Landroid/net/wifi/MloLink$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/MloLink;
+Landroid/net/wifi/MloLink$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/MloLink$1;->newArray(I)[Landroid/net/wifi/MloLink;
+Landroid/net/wifi/MloLink$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->-$$Nest$fputmApMacAddress(Landroid/net/wifi/MloLink;Landroid/net/MacAddress;)V
+Landroid/net/wifi/MloLink;->-$$Nest$fputmBand(Landroid/net/wifi/MloLink;I)V
+Landroid/net/wifi/MloLink;->-$$Nest$fputmChannel(Landroid/net/wifi/MloLink;I)V
+Landroid/net/wifi/MloLink;->-$$Nest$fputmLinkId(Landroid/net/wifi/MloLink;I)V
+Landroid/net/wifi/MloLink;->-$$Nest$fputmStaMacAddress(Landroid/net/wifi/MloLink;Landroid/net/MacAddress;)V
+Landroid/net/wifi/MloLink;->-$$Nest$fputmState(Landroid/net/wifi/MloLink;I)V
+Landroid/net/wifi/MloLink;-><clinit>()V
+Landroid/net/wifi/MloLink;-><init>()V,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;-><init>(Landroid/net/wifi/MloLink;J)V
+Landroid/net/wifi/MloLink;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->INVALID_MLO_LINK_ID:I,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->MAX_MLO_LINK_ID:I
+Landroid/net/wifi/MloLink;->MIN_MLO_LINK_ID:I
+Landroid/net/wifi/MloLink;->MLO_LINK_STATE_ACTIVE:I,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->MLO_LINK_STATE_IDLE:I,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->MLO_LINK_STATE_INVALID:I,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->MLO_LINK_STATE_UNASSOCIATED:I,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->describeContents()I,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->getApMacAddress()Landroid/net/MacAddress;,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->getBand()I,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->getChannel()I,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->getLinkId()I,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->getStaMacAddress()Landroid/net/MacAddress;,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->getState()I,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->getStateString(I)Ljava/lang/String;
+Landroid/net/wifi/MloLink;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/MloLink;->isValidState(I)Z
+Landroid/net/wifi/MloLink;->mApMacAddress:Landroid/net/MacAddress;
+Landroid/net/wifi/MloLink;->mBand:I
+Landroid/net/wifi/MloLink;->mChannel:I
+Landroid/net/wifi/MloLink;->mLinkId:I
+Landroid/net/wifi/MloLink;->mStaMacAddress:Landroid/net/MacAddress;
+Landroid/net/wifi/MloLink;->mState:I
+Landroid/net/wifi/MloLink;->setApMacAddress(Landroid/net/MacAddress;)V
+Landroid/net/wifi/MloLink;->setBand(I)V
+Landroid/net/wifi/MloLink;->setChannel(I)V
+Landroid/net/wifi/MloLink;->setLinkId(I)V
+Landroid/net/wifi/MloLink;->setStaMacAddress(Landroid/net/MacAddress;)V
+Landroid/net/wifi/MloLink;->setState(I)V
+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/ParcelUtil;-><init>()V
 Landroid/net/wifi/ParcelUtil;->readCertificate(Landroid/os/Parcel;)Ljava/security/cert/X509Certificate;
 Landroid/net/wifi/ParcelUtil;->readCertificates(Landroid/os/Parcel;)[Ljava/security/cert/X509Certificate;
@@ -1359,19 +1701,24 @@
 Landroid/net/wifi/ScanResult$InformationElement$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult$InformationElement;-><clinit>()V
 Landroid/net/wifi/ScanResult$InformationElement;-><init>()V
-Landroid/net/wifi/ScanResult$InformationElement;-><init>(II[B)V
+Landroid/net/wifi/ScanResult$InformationElement;-><init>(II[B)V,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult$InformationElement;-><init>(Landroid/net/wifi/ScanResult$InformationElement;)V,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult$InformationElement;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult$InformationElement;->EID_BSS_LOAD:I
+Landroid/net/wifi/ScanResult$InformationElement;->EID_COUNTRY:I
 Landroid/net/wifi/ScanResult$InformationElement;->EID_ERP:I
 Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_CAPS:I
 Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_SUPPORTED_RATES:I
 Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENSION_PRESENT:I
+Landroid/net/wifi/ScanResult$InformationElement;->EID_EXT_EHT_CAPABILITIES:I
+Landroid/net/wifi/ScanResult$InformationElement;->EID_EXT_EHT_OPERATION:I
 Landroid/net/wifi/ScanResult$InformationElement;->EID_EXT_HE_CAPABILITIES:I
 Landroid/net/wifi/ScanResult$InformationElement;->EID_EXT_HE_OPERATION:I
+Landroid/net/wifi/ScanResult$InformationElement;->EID_EXT_MULTI_LINK:I
 Landroid/net/wifi/ScanResult$InformationElement;->EID_HT_CAPABILITIES:I
 Landroid/net/wifi/ScanResult$InformationElement;->EID_HT_OPERATION:I
 Landroid/net/wifi/ScanResult$InformationElement;->EID_INTERWORKING:I
+Landroid/net/wifi/ScanResult$InformationElement;->EID_RNR:I
 Landroid/net/wifi/ScanResult$InformationElement;->EID_ROAMING_CONSORTIUM:I
 Landroid/net/wifi/ScanResult$InformationElement;->EID_RSN:I
 Landroid/net/wifi/ScanResult$InformationElement;->EID_SSID:I
@@ -1396,6 +1743,10 @@
 Landroid/net/wifi/ScanResult$RadioChainInfo;->id:I
 Landroid/net/wifi/ScanResult$RadioChainInfo;->level:I
 Landroid/net/wifi/ScanResult$RadioChainInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->-$$Nest$fputmAffiliatedMloLinks(Landroid/net/wifi/ScanResult;Ljava/util/List;)V
+Landroid/net/wifi/ScanResult;->-$$Nest$fputmApMldMacAddress(Landroid/net/wifi/ScanResult;Landroid/net/MacAddress;)V
+Landroid/net/wifi/ScanResult;->-$$Nest$fputmApMloLinkId(Landroid/net/wifi/ScanResult;I)V
+Landroid/net/wifi/ScanResult;->-$$Nest$fputmWifiStandard(Landroid/net/wifi/ScanResult;I)V
 Landroid/net/wifi/ScanResult;-><clinit>()V
 Landroid/net/wifi/ScanResult;-><init>()V,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;-><init>(Landroid/net/wifi/ScanResult;)V,public-api,system-api,test-api
@@ -1425,6 +1776,7 @@
 Landroid/net/wifi/ScanResult;->BSSID:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->CHANNEL_WIDTH_160MHZ:I,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->CHANNEL_WIDTH_20MHZ:I,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->CHANNEL_WIDTH_320MHZ:I,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->CHANNEL_WIDTH_40MHZ:I,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->CHANNEL_WIDTH_80MHZ:I,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->CHANNEL_WIDTH_80MHZ_PLUS_MHZ:I,public-api,system-api,test-api
@@ -1441,6 +1793,7 @@
 Landroid/net/wifi/ScanResult;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->FLAG_80211mc_RESPONDER:J
 Landroid/net/wifi/ScanResult;->FLAG_PASSPOINT_NETWORK:J
+Landroid/net/wifi/ScanResult;->KEY_MGMT_DPP:I
 Landroid/net/wifi/ScanResult;->KEY_MGMT_EAP:I,system-api,test-api
 Landroid/net/wifi/ScanResult;->KEY_MGMT_EAP_SHA256:I,system-api,test-api
 Landroid/net/wifi/ScanResult;->KEY_MGMT_EAP_SUITE_B_192:I,system-api,test-api
@@ -1459,6 +1812,11 @@
 Landroid/net/wifi/ScanResult;->KEY_MGMT_UNKNOWN:I
 Landroid/net/wifi/ScanResult;->KEY_MGMT_WAPI_CERT:I,system-api,test-api
 Landroid/net/wifi/ScanResult;->KEY_MGMT_WAPI_PSK:I,system-api,test-api
+Landroid/net/wifi/ScanResult;->PREAMBLE_EHT:I,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->PREAMBLE_HE:I,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->PREAMBLE_HT:I,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->PREAMBLE_LEGACY:I,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->PREAMBLE_VHT:I,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->PROTOCOL_NONE:I,system-api,test-api
 Landroid/net/wifi/ScanResult;->PROTOCOL_OSEN:I,system-api,test-api
 Landroid/net/wifi/ScanResult;->PROTOCOL_RSN:I,system-api,test-api
@@ -1473,10 +1831,10 @@
 Landroid/net/wifi/ScanResult;->WIFI_STANDARD_11AC:I,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->WIFI_STANDARD_11AD:I,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->WIFI_STANDARD_11AX:I,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->WIFI_STANDARD_11BE:I,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->WIFI_STANDARD_11N:I,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->WIFI_STANDARD_LEGACY:I,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->WIFI_STANDARD_UNKNOWN:I,public-api,system-api,test-api
-Landroid/net/wifi/ScanResult;->access$002(Landroid/net/wifi/ScanResult;I)I
 Landroid/net/wifi/ScanResult;->anqpDomainId:I
 Landroid/net/wifi/ScanResult;->anqpElements:[Landroid/net/wifi/AnqpInformationElement;
 Landroid/net/wifi/ScanResult;->anqpLines:Ljava/util/List;
@@ -1492,7 +1850,14 @@
 Landroid/net/wifi/ScanResult;->distanceSdCm:I
 Landroid/net/wifi/ScanResult;->flags:J
 Landroid/net/wifi/ScanResult;->frequency:I,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->getAffiliatedMloLinks()Ljava/util/List;,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->getApMldMacAddress()Landroid/net/MacAddress;,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->getApMloLinkId()I,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->getBand()I,system-api,test-api
+Landroid/net/wifi/ScanResult;->getBandFromOpClass(II)I
 Landroid/net/wifi/ScanResult;->getInformationElements()Ljava/util/List;,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->getSecurityTypes()[I,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->getWifiSsid()Landroid/net/wifi/WifiSsid;,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->getWifiStandard()I,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->hessid:J
 Landroid/net/wifi/ScanResult;->ifaceName:Ljava/lang/String;
@@ -1509,30 +1874,61 @@
 Landroid/net/wifi/ScanResult;->is6GhzPsc()Z
 Landroid/net/wifi/ScanResult;->is80211McRTTResponder:Z
 Landroid/net/wifi/ScanResult;->is80211mcResponder()Z,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->isHiddenSsid(Landroid/net/wifi/WifiSsid;)Z
 Landroid/net/wifi/ScanResult;->isPasspointNetwork()Z,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->level:I,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->mAffiliatedMloLinks:Ljava/util/List;
+Landroid/net/wifi/ScanResult;->mApMldMacAddress:Landroid/net/MacAddress;
+Landroid/net/wifi/ScanResult;->mApMloLinkId:I
 Landroid/net/wifi/ScanResult;->mWifiStandard:I
 Landroid/net/wifi/ScanResult;->numUsage:I
 Landroid/net/wifi/ScanResult;->operatorFriendlyName:Ljava/lang/CharSequence;,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->radioChainInfos:[Landroid/net/wifi/ScanResult$RadioChainInfo;
 Landroid/net/wifi/ScanResult;->seen:J
+Landroid/net/wifi/ScanResult;->setAffiliatedMloLinks(Ljava/util/List;)V
+Landroid/net/wifi/ScanResult;->setApMldMacAddress(Landroid/net/MacAddress;)V
+Landroid/net/wifi/ScanResult;->setApMloLinkId(I)V
 Landroid/net/wifi/ScanResult;->setFlag(J)V
+Landroid/net/wifi/ScanResult;->setWifiSsid(Landroid/net/wifi/WifiSsid;)V,system-api,test-api
 Landroid/net/wifi/ScanResult;->setWifiStandard(I)V
 Landroid/net/wifi/ScanResult;->timestamp:J,public-api,system-api,test-api
+Landroid/net/wifi/ScanResult;->toBand(I)I
 Landroid/net/wifi/ScanResult;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->untrusted:Z
 Landroid/net/wifi/ScanResult;->venueName:Ljava/lang/CharSequence;,public-api,system-api,test-api
 Landroid/net/wifi/ScanResult;->wifiSsid:Landroid/net/wifi/WifiSsid;
 Landroid/net/wifi/ScanResult;->wifiStandardToString(I)Ljava/lang/String;
 Landroid/net/wifi/ScanResult;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/wifi/SecurityParams$1;-><init>()V
+Landroid/net/wifi/SecurityParams$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/SecurityParams;
+Landroid/net/wifi/SecurityParams$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/SecurityParams$1;->newArray(I)[Landroid/net/wifi/SecurityParams;
+Landroid/net/wifi/SecurityParams$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedAuthAlgorithms(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedGroupCiphers(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedGroupManagementCiphers(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedKeyManagement(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedPairwiseCiphers(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedProtocols(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmAllowedSuiteBCiphers(Landroid/net/wifi/SecurityParams;Ljava/util/BitSet;)V
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmEnabled(Landroid/net/wifi/SecurityParams;Z)V
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmIsAddedByAutoUpgrade(Landroid/net/wifi/SecurityParams;Z)V
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmIsSaeH2eOnlyMode(Landroid/net/wifi/SecurityParams;Z)V
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmIsSaePkOnlyMode(Landroid/net/wifi/SecurityParams;Z)V
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmRequirePmf(Landroid/net/wifi/SecurityParams;Z)V
+Landroid/net/wifi/SecurityParams;->-$$Nest$fputmSecurityType(Landroid/net/wifi/SecurityParams;I)V
+Landroid/net/wifi/SecurityParams;->-$$Nest$smreadBitSet(Landroid/os/Parcel;)Ljava/util/BitSet;
+Landroid/net/wifi/SecurityParams;-><clinit>()V
 Landroid/net/wifi/SecurityParams;-><init>()V
+Landroid/net/wifi/SecurityParams;-><init>(Landroid/net/wifi/SecurityParams-IA;)V
 Landroid/net/wifi/SecurityParams;-><init>(Landroid/net/wifi/SecurityParams;)V
+Landroid/net/wifi/SecurityParams;->CREATOR:Landroid/os/Parcelable$Creator;
 Landroid/net/wifi/SecurityParams;->PASSPOINT_R1:I
 Landroid/net/wifi/SecurityParams;->PASSPOINT_R2:I
 Landroid/net/wifi/SecurityParams;->PASSPOINT_R3:I
 Landroid/net/wifi/SecurityParams;->TAG:Ljava/lang/String;
+Landroid/net/wifi/SecurityParams;->createDppParams()Landroid/net/wifi/SecurityParams;
 Landroid/net/wifi/SecurityParams;->createEnhancedOpenParams()Landroid/net/wifi/SecurityParams;
-Landroid/net/wifi/SecurityParams;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/SecurityParams;
 Landroid/net/wifi/SecurityParams;->createOpenParams()Landroid/net/wifi/SecurityParams;
 Landroid/net/wifi/SecurityParams;->createOsenParams()Landroid/net/wifi/SecurityParams;
 Landroid/net/wifi/SecurityParams;->createPasspointParams(I)Landroid/net/wifi/SecurityParams;
@@ -1545,6 +1941,7 @@
 Landroid/net/wifi/SecurityParams;->createWpa3PersonalParams()Landroid/net/wifi/SecurityParams;
 Landroid/net/wifi/SecurityParams;->createWpaWpa2EnterpriseParams()Landroid/net/wifi/SecurityParams;
 Landroid/net/wifi/SecurityParams;->createWpaWpa2PersonalParams()Landroid/net/wifi/SecurityParams;
+Landroid/net/wifi/SecurityParams;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/SecurityParams;->enableFils(ZZ)V
 Landroid/net/wifi/SecurityParams;->enableSaeH2eOnlyMode(Z)V
 Landroid/net/wifi/SecurityParams;->enableSaePkOnlyMode(Z)V
@@ -1589,12 +1986,13 @@
 Landroid/net/wifi/SecurityParams;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/SecurityParams;->updateLegacyWifiConfiguration(Landroid/net/wifi/WifiConfiguration;)V
 Landroid/net/wifi/SecurityParams;->writeBitSet(Landroid/os/Parcel;Ljava/util/BitSet;)V
-Landroid/net/wifi/SecurityParams;->writeToParcel(Landroid/os/Parcel;I)V
+Landroid/net/wifi/SecurityParams;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/wifi/SoftApCapability$1;-><init>()V
 Landroid/net/wifi/SoftApCapability$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/SoftApCapability;
 Landroid/net/wifi/SoftApCapability$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/SoftApCapability$1;->newArray(I)[Landroid/net/wifi/SoftApCapability;
 Landroid/net/wifi/SoftApCapability$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/SoftApCapability;->-$$Nest$fputmMaximumSupportedClientNumber(Landroid/net/wifi/SoftApCapability;I)V
 Landroid/net/wifi/SoftApCapability;-><clinit>()V
 Landroid/net/wifi/SoftApCapability;-><init>(J)V
 Landroid/net/wifi/SoftApCapability;-><init>(Landroid/net/wifi/SoftApCapability;)V
@@ -1607,71 +2005,123 @@
 Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_BAND_6G_SUPPORTED:J,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_CLIENT_FORCE_DISCONNECT:J,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_IEEE80211_AX:J,system-api,test-api
+Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_IEEE80211_BE:J,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_MAC_ADDRESS_CUSTOMIZATION:J,system-api,test-api
+Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_WPA3_OWE:J,system-api,test-api
+Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_WPA3_OWE_TRANSITION:J,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->SOFTAP_FEATURE_WPA3_SAE:J,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->TAG:Ljava/lang/String;
-Landroid/net/wifi/SoftApCapability;->access$002(Landroid/net/wifi/SoftApCapability;I)I
 Landroid/net/wifi/SoftApCapability;->areFeaturesSupported(J)Z,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/SoftApCapability;->getCountryCode()Ljava/lang/String;
 Landroid/net/wifi/SoftApCapability;->getMaxSupportedClients()I,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->getSupportedChannelList(I)[I,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/SoftApCapability;->mCountryCodeFromDriver:Ljava/lang/String;
 Landroid/net/wifi/SoftApCapability;->mMaximumSupportedClientNumber:I
 Landroid/net/wifi/SoftApCapability;->mSupportedChannelListIn24g:[I
 Landroid/net/wifi/SoftApCapability;->mSupportedChannelListIn5g:[I
 Landroid/net/wifi/SoftApCapability;->mSupportedChannelListIn60g:[I
 Landroid/net/wifi/SoftApCapability;->mSupportedChannelListIn6g:[I
 Landroid/net/wifi/SoftApCapability;->mSupportedFeatures:J
+Landroid/net/wifi/SoftApCapability;->setCountryCode(Ljava/lang/String;)V
 Landroid/net/wifi/SoftApCapability;->setMaxSupportedClients(I)V
 Landroid/net/wifi/SoftApCapability;->setSupportedChannelList(I[I)Z
 Landroid/net/wifi/SoftApCapability;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/SoftApCapability;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$$ExternalSyntheticLambda0;-><init>()V
+Landroid/net/wifi/SoftApConfiguration$$ExternalSyntheticLambda0;->applyAsInt(Ljava/lang/Object;)I,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$1;-><init>()V
 Landroid/net/wifi/SoftApConfiguration$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/SoftApConfiguration;
 Landroid/net/wifi/SoftApConfiguration$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$1;->newArray(I)[Landroid/net/wifi/SoftApConfiguration;
 Landroid/net/wifi/SoftApConfiguration$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder$$ExternalSyntheticLambda0;-><init>()V
+Landroid/net/wifi/SoftApConfiguration$Builder$$ExternalSyntheticLambda0;->get()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;-><init>()V,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;-><init>(Landroid/net/wifi/SoftApConfiguration;)V,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->build()Landroid/net/wifi/SoftApConfiguration;,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder;->mAllowedAcsChannels2g:Ljava/util/Set;
+Landroid/net/wifi/SoftApConfiguration$Builder;->mAllowedAcsChannels5g:Ljava/util/Set;
+Landroid/net/wifi/SoftApConfiguration$Builder;->mAllowedAcsChannels6g:Ljava/util/Set;
 Landroid/net/wifi/SoftApConfiguration$Builder;->mAllowedClientList:Ljava/util/List;
 Landroid/net/wifi/SoftApConfiguration$Builder;->mAutoShutdownEnabled:Z
 Landroid/net/wifi/SoftApConfiguration$Builder;->mBlockedClientList:Ljava/util/List;
 Landroid/net/wifi/SoftApConfiguration$Builder;->mBridgedModeOpportunisticShutdownEnabled:Z
+Landroid/net/wifi/SoftApConfiguration$Builder;->mBridgedModeOpportunisticShutdownTimeoutMillis:J
 Landroid/net/wifi/SoftApConfiguration$Builder;->mBssid:Landroid/net/MacAddress;
 Landroid/net/wifi/SoftApConfiguration$Builder;->mChannels:Landroid/util/SparseIntArray;
 Landroid/net/wifi/SoftApConfiguration$Builder;->mClientControlByUser:Z
 Landroid/net/wifi/SoftApConfiguration$Builder;->mHiddenSsid:Z
 Landroid/net/wifi/SoftApConfiguration$Builder;->mIeee80211axEnabled:Z
+Landroid/net/wifi/SoftApConfiguration$Builder;->mIeee80211beEnabled:Z
 Landroid/net/wifi/SoftApConfiguration$Builder;->mIsUserConfiguration:Z
 Landroid/net/wifi/SoftApConfiguration$Builder;->mMacRandomizationSetting:I
+Landroid/net/wifi/SoftApConfiguration$Builder;->mMaxChannelBandwidth:I
 Landroid/net/wifi/SoftApConfiguration$Builder;->mMaxNumberOfClients:I
 Landroid/net/wifi/SoftApConfiguration$Builder;->mPassphrase:Ljava/lang/String;
+Landroid/net/wifi/SoftApConfiguration$Builder;->mPersistentRandomizedMacAddress:Landroid/net/MacAddress;
 Landroid/net/wifi/SoftApConfiguration$Builder;->mSecurityType:I
 Landroid/net/wifi/SoftApConfiguration$Builder;->mShutdownTimeoutMillis:J
-Landroid/net/wifi/SoftApConfiguration$Builder;->mSsid:Ljava/lang/String;
+Landroid/net/wifi/SoftApConfiguration$Builder;->mVendorElements:Ljava/util/List;
+Landroid/net/wifi/SoftApConfiguration$Builder;->mWifiSsid:Landroid/net/wifi/WifiSsid;
+Landroid/net/wifi/SoftApConfiguration$Builder;->setAllowedAcsChannels(I[I)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setAllowedClientList(Ljava/util/List;)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setAutoShutdownEnabled(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setBand(I)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setBands([I)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setBlockedClientList(Ljava/util/List;)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setBridgedModeOpportunisticShutdownEnabled(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder;->setBridgedModeOpportunisticShutdownTimeoutMillis(J)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setBssid(Landroid/net/MacAddress;)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setChannel(II)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setChannels(Landroid/util/SparseIntArray;)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setClientControlByUserEnabled(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setHiddenSsid(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setIeee80211axEnabled(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder;->setIeee80211beEnabled(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setMacRandomizationSetting(I)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder;->setMaxChannelBandwidth(I)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setMaxNumberOfClients(I)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration$Builder;->setPassphrase(Ljava/lang/String;I)Landroid/net/wifi/SoftApConfiguration$Builder;,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration$Builder;->setRandomizedMacAddress(Landroid/net/MacAddress;)Landroid/net/wifi/SoftApConfiguration$Builder;
 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;->setUserConfiguration(Z)Landroid/net/wifi/SoftApConfiguration$Builder;
+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;->-$$Nest$fgetmAllowedAcsChannels2g(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/Set;
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmAllowedAcsChannels5g(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/Set;
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmAllowedAcsChannels6g(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/Set;
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmAllowedClientList(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/List;
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmAutoShutdownEnabled(Landroid/net/wifi/SoftApConfiguration;)Z
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmBlockedClientList(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/List;
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmBridgedModeOpportunisticShutdownEnabled(Landroid/net/wifi/SoftApConfiguration;)Z
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmBridgedModeOpportunisticShutdownTimeoutMillis(Landroid/net/wifi/SoftApConfiguration;)J
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmBssid(Landroid/net/wifi/SoftApConfiguration;)Landroid/net/MacAddress;
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmChannels(Landroid/net/wifi/SoftApConfiguration;)Landroid/util/SparseIntArray;
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmClientControlByUser(Landroid/net/wifi/SoftApConfiguration;)Z
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmHiddenSsid(Landroid/net/wifi/SoftApConfiguration;)Z
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmIeee80211axEnabled(Landroid/net/wifi/SoftApConfiguration;)Z
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmIeee80211beEnabled(Landroid/net/wifi/SoftApConfiguration;)Z
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmIsUserConfiguration(Landroid/net/wifi/SoftApConfiguration;)Z
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmMacRandomizationSetting(Landroid/net/wifi/SoftApConfiguration;)I
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmMaxChannelBandwidth(Landroid/net/wifi/SoftApConfiguration;)I
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmMaxNumberOfClients(Landroid/net/wifi/SoftApConfiguration;)I
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmPassphrase(Landroid/net/wifi/SoftApConfiguration;)Ljava/lang/String;
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmPersistentRandomizedMacAddress(Landroid/net/wifi/SoftApConfiguration;)Landroid/net/MacAddress;
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmSecurityType(Landroid/net/wifi/SoftApConfiguration;)I
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmShutdownTimeoutMillis(Landroid/net/wifi/SoftApConfiguration;)J
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmVendorElements(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/List;
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$fgetmWifiSsid(Landroid/net/wifi/SoftApConfiguration;)Landroid/net/wifi/WifiSsid;
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$smisBandValid(I)Z
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$smisChannelBandPairValid(II)Z
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$smreadHashSetInt(Landroid/os/Parcel;)Ljava/util/Set;
+Landroid/net/wifi/SoftApConfiguration;->-$$Nest$smreadSparseIntArray(Landroid/os/Parcel;)Landroid/util/SparseIntArray;
 Landroid/net/wifi/SoftApConfiguration;-><clinit>()V
-Landroid/net/wifi/SoftApConfiguration;-><init>(Ljava/lang/String;Landroid/net/MacAddress;Ljava/lang/String;ZLandroid/util/SparseIntArray;IIZJZLjava/util/List;Ljava/util/List;IZZZ)V
-Landroid/net/wifi/SoftApConfiguration;-><init>(Ljava/lang/String;Landroid/net/MacAddress;Ljava/lang/String;ZLandroid/util/SparseIntArray;IIZJZLjava/util/List;Ljava/util/List;IZZZLandroid/net/wifi/SoftApConfiguration$1;)V
+Landroid/net/wifi/SoftApConfiguration;-><init>(Landroid/net/wifi/WifiSsid;Landroid/net/MacAddress;Ljava/lang/String;ZLandroid/util/SparseIntArray;IIZJZLjava/util/List;Ljava/util/List;IZZZZJLjava/util/List;Landroid/net/MacAddress;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;I)V
+Landroid/net/wifi/SoftApConfiguration;-><init>(Landroid/net/wifi/WifiSsid;Landroid/net/MacAddress;Ljava/lang/String;ZLandroid/util/SparseIntArray;IIZJZLjava/util/List;Ljava/util/List;IZZZZJLjava/util/List;Landroid/net/MacAddress;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ILandroid/net/wifi/SoftApConfiguration-IA;)V
 Landroid/net/wifi/SoftApConfiguration;->BAND_2GHZ:I,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->BAND_5GHZ:I,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->BAND_60GHZ:I,system-api,test-api
@@ -1679,6 +2129,8 @@
 Landroid/net/wifi/SoftApConfiguration;->BAND_ANY:I,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->BAND_TYPES:[I
 Landroid/net/wifi/SoftApConfiguration;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->DEFAULT_TIMEOUT:J,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->FORCE_MUTUAL_EXCLUSIVE_BSSID_MAC_RAMDONIZATION_SETTING:J
 Landroid/net/wifi/SoftApConfiguration;->MAX_CH_2G_BAND:I
 Landroid/net/wifi/SoftApConfiguration;->MAX_CH_5G_BAND:I
 Landroid/net/wifi/SoftApConfiguration;->MAX_CH_60G_BAND:I
@@ -1687,50 +2139,41 @@
 Landroid/net/wifi/SoftApConfiguration;->MIN_CH_5G_BAND:I
 Landroid/net/wifi/SoftApConfiguration;->MIN_CH_60G_BAND:I
 Landroid/net/wifi/SoftApConfiguration;->MIN_CH_6G_BAND:I
-Landroid/net/wifi/SoftApConfiguration;->PSK_MAX_LEN:I
-Landroid/net/wifi/SoftApConfiguration;->PSK_MIN_LEN:I
 Landroid/net/wifi/SoftApConfiguration;->RANDOMIZATION_NONE:I,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->RANDOMIZATION_NON_PERSISTENT:I,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->RANDOMIZATION_PERSISTENT:I,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->REMOVE_ZERO_FOR_TIMEOUT_SETTING:J
 Landroid/net/wifi/SoftApConfiguration;->SECURITY_TYPE_OPEN:I,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->SECURITY_TYPE_WPA2_PSK:I,public-api,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->SECURITY_TYPE_WPA3_OWE:I,public-api,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->SECURITY_TYPE_WPA3_OWE_TRANSITION:I,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->SECURITY_TYPE_WPA3_SAE:I,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->SECURITY_TYPE_WPA3_SAE_TRANSITION:I,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->TAG:Ljava/lang/String;
-Landroid/net/wifi/SoftApConfiguration;->access$000(Landroid/os/Parcel;)Landroid/util/SparseIntArray;
-Landroid/net/wifi/SoftApConfiguration;->access$1000(Landroid/net/wifi/SoftApConfiguration;)J
-Landroid/net/wifi/SoftApConfiguration;->access$1100(Landroid/net/wifi/SoftApConfiguration;)Z
-Landroid/net/wifi/SoftApConfiguration;->access$1200(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/List;
-Landroid/net/wifi/SoftApConfiguration;->access$1300(Landroid/net/wifi/SoftApConfiguration;)Ljava/util/List;
-Landroid/net/wifi/SoftApConfiguration;->access$1400(Landroid/net/wifi/SoftApConfiguration;)I
-Landroid/net/wifi/SoftApConfiguration;->access$1500(Landroid/net/wifi/SoftApConfiguration;)Z
-Landroid/net/wifi/SoftApConfiguration;->access$1600(Landroid/net/wifi/SoftApConfiguration;)Z
-Landroid/net/wifi/SoftApConfiguration;->access$1700(Landroid/net/wifi/SoftApConfiguration;)Z
-Landroid/net/wifi/SoftApConfiguration;->access$1800(I)Z
-Landroid/net/wifi/SoftApConfiguration;->access$1900(II)Z
-Landroid/net/wifi/SoftApConfiguration;->access$200(Landroid/net/wifi/SoftApConfiguration;)Ljava/lang/String;
-Landroid/net/wifi/SoftApConfiguration;->access$300(Landroid/net/wifi/SoftApConfiguration;)Landroid/net/MacAddress;
-Landroid/net/wifi/SoftApConfiguration;->access$400(Landroid/net/wifi/SoftApConfiguration;)Ljava/lang/String;
-Landroid/net/wifi/SoftApConfiguration;->access$500(Landroid/net/wifi/SoftApConfiguration;)Z
-Landroid/net/wifi/SoftApConfiguration;->access$600(Landroid/net/wifi/SoftApConfiguration;)Landroid/util/SparseIntArray;
-Landroid/net/wifi/SoftApConfiguration;->access$700(Landroid/net/wifi/SoftApConfiguration;)I
-Landroid/net/wifi/SoftApConfiguration;->access$800(Landroid/net/wifi/SoftApConfiguration;)I
-Landroid/net/wifi/SoftApConfiguration;->access$900(Landroid/net/wifi/SoftApConfiguration;)Z
 Landroid/net/wifi/SoftApConfiguration;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getAllowedAcsChannels(I)[I,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getAllowedClientList()Ljava/util/List;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getBand()I,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getBands()[I
 Landroid/net/wifi/SoftApConfiguration;->getBlockedClientList()Ljava/util/List;,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getBridgedModeOpportunisticShutdownTimeoutMillis()J,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getBridgedModeOpportunisticShutdownTimeoutMillisInternal()J
 Landroid/net/wifi/SoftApConfiguration;->getBssid()Landroid/net/MacAddress;,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getChannel()I,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getChannels()Landroid/util/SparseIntArray;,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getMacRandomizationSetting()I,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getMacRandomizationSettingInternal()I
+Landroid/net/wifi/SoftApConfiguration;->getMaxChannelBandwidth()I,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getMaxNumberOfClients()I,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->getPassphrase()Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getPersistentRandomizedMacAddress()Landroid/net/MacAddress;,system-api,test-api
 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;->getVendorElements()Ljava/util/List;,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->getVendorElementsInternal()Ljava/util/List;
+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
 Landroid/net/wifi/SoftApConfiguration;->isAutoShutdownEnabled()Z,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->isBandValid(I)Z
@@ -1741,27 +2184,39 @@
 Landroid/net/wifi/SoftApConfiguration;->isHiddenSsid()Z,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->isIeee80211axEnabled()Z,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->isIeee80211axEnabledInternal()Z
+Landroid/net/wifi/SoftApConfiguration;->isIeee80211beEnabled()Z,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->isIeee80211beEnabledInternal()Z
 Landroid/net/wifi/SoftApConfiguration;->isUserConfiguration()Z,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->isUserConfigurationInternal()Z
+Landroid/net/wifi/SoftApConfiguration;->mAllowedAcsChannels2g:Ljava/util/Set;
+Landroid/net/wifi/SoftApConfiguration;->mAllowedAcsChannels5g:Ljava/util/Set;
+Landroid/net/wifi/SoftApConfiguration;->mAllowedAcsChannels6g:Ljava/util/Set;
 Landroid/net/wifi/SoftApConfiguration;->mAllowedClientList:Ljava/util/List;
 Landroid/net/wifi/SoftApConfiguration;->mAutoShutdownEnabled:Z
 Landroid/net/wifi/SoftApConfiguration;->mBlockedClientList:Ljava/util/List;
 Landroid/net/wifi/SoftApConfiguration;->mBridgedModeOpportunisticShutdownEnabled:Z
+Landroid/net/wifi/SoftApConfiguration;->mBridgedModeOpportunisticShutdownTimeoutMillis:J
 Landroid/net/wifi/SoftApConfiguration;->mBssid:Landroid/net/MacAddress;
 Landroid/net/wifi/SoftApConfiguration;->mChannels:Landroid/util/SparseIntArray;
 Landroid/net/wifi/SoftApConfiguration;->mClientControlByUser:Z
 Landroid/net/wifi/SoftApConfiguration;->mHiddenSsid:Z
 Landroid/net/wifi/SoftApConfiguration;->mIeee80211axEnabled:Z
+Landroid/net/wifi/SoftApConfiguration;->mIeee80211beEnabled:Z
 Landroid/net/wifi/SoftApConfiguration;->mIsUserConfiguration:Z
 Landroid/net/wifi/SoftApConfiguration;->mMacRandomizationSetting:I
+Landroid/net/wifi/SoftApConfiguration;->mMaxChannelBandwidth:I
 Landroid/net/wifi/SoftApConfiguration;->mMaxNumberOfClients:I
 Landroid/net/wifi/SoftApConfiguration;->mPassphrase:Ljava/lang/String;
+Landroid/net/wifi/SoftApConfiguration;->mPersistentRandomizedMacAddress:Landroid/net/MacAddress;
 Landroid/net/wifi/SoftApConfiguration;->mSecurityType:I
 Landroid/net/wifi/SoftApConfiguration;->mShutdownTimeoutMillis:J
-Landroid/net/wifi/SoftApConfiguration;->mSsid:Ljava/lang/String;
+Landroid/net/wifi/SoftApConfiguration;->mVendorElements:Ljava/util/List;
+Landroid/net/wifi/SoftApConfiguration;->mWifiSsid:Landroid/net/wifi/WifiSsid;
+Landroid/net/wifi/SoftApConfiguration;->readHashSetInt(Landroid/os/Parcel;)Ljava/util/Set;
 Landroid/net/wifi/SoftApConfiguration;->readSparseIntArray(Landroid/os/Parcel;)Landroid/util/SparseIntArray;
 Landroid/net/wifi/SoftApConfiguration;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/SoftApConfiguration;->toWifiConfiguration()Landroid/net/wifi/WifiConfiguration;,system-api,test-api
+Landroid/net/wifi/SoftApConfiguration;->writeHashSetInt(Landroid/os/Parcel;Ljava/util/Set;)V
 Landroid/net/wifi/SoftApConfiguration;->writeSparseIntArray(Landroid/os/Parcel;Landroid/util/SparseIntArray;)V
 Landroid/net/wifi/SoftApConfiguration;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/wifi/SoftApInfo$1;-><init>()V
@@ -1769,6 +2224,12 @@
 Landroid/net/wifi/SoftApInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/SoftApInfo$1;->newArray(I)[Landroid/net/wifi/SoftApInfo;
 Landroid/net/wifi/SoftApInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/SoftApInfo;->-$$Nest$fputmApInstanceIdentifier(Landroid/net/wifi/SoftApInfo;Ljava/lang/String;)V
+Landroid/net/wifi/SoftApInfo;->-$$Nest$fputmBandwidth(Landroid/net/wifi/SoftApInfo;I)V
+Landroid/net/wifi/SoftApInfo;->-$$Nest$fputmBssid(Landroid/net/wifi/SoftApInfo;Landroid/net/MacAddress;)V
+Landroid/net/wifi/SoftApInfo;->-$$Nest$fputmFrequency(Landroid/net/wifi/SoftApInfo;I)V
+Landroid/net/wifi/SoftApInfo;->-$$Nest$fputmIdleShutdownTimeoutMillis(Landroid/net/wifi/SoftApInfo;J)V
+Landroid/net/wifi/SoftApInfo;->-$$Nest$fputmWifiStandard(Landroid/net/wifi/SoftApInfo;I)V
 Landroid/net/wifi/SoftApInfo;-><clinit>()V
 Landroid/net/wifi/SoftApInfo;-><init>()V
 Landroid/net/wifi/SoftApInfo;-><init>(Landroid/net/wifi/SoftApInfo;)V
@@ -1776,20 +2237,16 @@
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_20MHZ:I,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_20MHZ_NOHT:I,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_2160MHZ:I,system-api,test-api
+Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_320MHZ:I,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_40MHZ:I,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_4320MHZ:I,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_6480MHZ:I,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_80MHZ:I,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_80MHZ_PLUS_MHZ:I,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_8640MHZ:I,system-api,test-api
+Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_AUTO:I,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_INVALID:I,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
-Landroid/net/wifi/SoftApInfo;->access$002(Landroid/net/wifi/SoftApInfo;I)I
-Landroid/net/wifi/SoftApInfo;->access$102(Landroid/net/wifi/SoftApInfo;I)I
-Landroid/net/wifi/SoftApInfo;->access$202(Landroid/net/wifi/SoftApInfo;Landroid/net/MacAddress;)Landroid/net/MacAddress;
-Landroid/net/wifi/SoftApInfo;->access$302(Landroid/net/wifi/SoftApInfo;I)I
-Landroid/net/wifi/SoftApInfo;->access$402(Landroid/net/wifi/SoftApInfo;Ljava/lang/String;)Ljava/lang/String;
-Landroid/net/wifi/SoftApInfo;->access$502(Landroid/net/wifi/SoftApInfo;J)J
 Landroid/net/wifi/SoftApInfo;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/SoftApInfo;->getApInstanceIdentifier()Ljava/lang/String;
@@ -1858,10 +2315,11 @@
 Landroid/net/wifi/WifiAvailableChannel;-><clinit>()V
 Landroid/net/wifi/WifiAvailableChannel;-><init>(II)V,system-api,test-api
 Landroid/net/wifi/WifiAvailableChannel;-><init>(Landroid/os/Parcel;)V
-Landroid/net/wifi/WifiAvailableChannel;-><init>(Landroid/os/Parcel;Landroid/net/wifi/WifiAvailableChannel$1;)V
+Landroid/net/wifi/WifiAvailableChannel;-><init>(Landroid/os/Parcel;Landroid/net/wifi/WifiAvailableChannel-IA;)V
 Landroid/net/wifi/WifiAvailableChannel;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
 Landroid/net/wifi/WifiAvailableChannel;->FILTER_CELLULAR_COEXISTENCE:I
 Landroid/net/wifi/WifiAvailableChannel;->FILTER_CONCURRENCY:I
+Landroid/net/wifi/WifiAvailableChannel;->FILTER_NAN_INSTANT_MODE:I
 Landroid/net/wifi/WifiAvailableChannel;->FILTER_REGULATORY:I
 Landroid/net/wifi/WifiAvailableChannel;->OP_MODE_SAP:I,system-api,test-api
 Landroid/net/wifi/WifiAvailableChannel;->OP_MODE_STA:I,system-api,test-api
@@ -1888,7 +2346,7 @@
 Landroid/net/wifi/WifiClient;-><clinit>()V
 Landroid/net/wifi/WifiClient;-><init>(Landroid/net/MacAddress;Ljava/lang/String;)V
 Landroid/net/wifi/WifiClient;-><init>(Landroid/os/Parcel;)V
-Landroid/net/wifi/WifiClient;-><init>(Landroid/os/Parcel;Landroid/net/wifi/WifiClient$1;)V
+Landroid/net/wifi/WifiClient;-><init>(Landroid/os/Parcel;Landroid/net/wifi/WifiClient-IA;)V
 Landroid/net/wifi/WifiClient;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
 Landroid/net/wifi/WifiClient;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiClient;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
@@ -1899,99 +2357,75 @@
 Landroid/net/wifi/WifiClient;->mMacAddress:Landroid/net/MacAddress;
 Landroid/net/wifi/WifiClient;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiClient;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;-><init>(Landroid/os/Parcel;I)V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;->f$0:Landroid/os/Parcel;
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;->f$1:I
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;-><init>(I)V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;->f$0:I
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;-><init>()V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;-><init>(Z)V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda10;->f$0:Z
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda11;-><init>(I)V
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda11;->f$0:I
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda11;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda12;-><init>(I)V
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda12;->f$0:I
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda12;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;-><init>(I)V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->f$0:I
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;-><init>(Z)V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda13;->f$0:Z
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;-><init>(I)V
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;->f$0:I
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda14;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda15;-><init>(Landroid/net/wifi/SecurityParams;)V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda15;->f$0:Landroid/net/wifi/SecurityParams;
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda15;-><init>()V
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda15;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda16;-><clinit>()V
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda16;-><init>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda16;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda16;
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda16;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;-><clinit>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;-><init>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;-><clinit>()V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;-><init>(ZZ)V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->f$0:Z
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda17;->f$1:Z
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;-><init>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda18;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;-><clinit>()V
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;-><init>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda19;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda1;-><init>(Ljava/lang/StringBuilder;)V
+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$$ExternalSyntheticLambda1;-><init>(Landroid/os/Parcel;I)V
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda1;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda1;->f$0:Ljava/lang/StringBuilder;
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;-><clinit>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;-><init>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;-><clinit>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;-><init>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda1;->f$0:Landroid/os/Parcel;
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda1;->f$1:I
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;-><init>(Ljava/lang/StringBuilder;)V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda20;->f$0:Ljava/lang/StringBuilder;
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;-><init>(Landroid/net/wifi/SecurityParams;)V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;->f$0:Landroid/net/wifi/SecurityParams;
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda21;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda22;-><clinit>()V
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda22;-><init>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda22;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda22;
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda22;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;-><clinit>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;-><init>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda24;-><clinit>()V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;-><init>(Z)V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda23;->f$0:Z
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda24;-><init>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda24;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda24;
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda24;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;-><clinit>()V
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;-><init>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda25;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;-><init>(Z)V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;->f$0:Z
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda3;-><init>(Z)V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda3;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda3;->f$0:Z
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;-><init>(Z)V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;-><init>(I)V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;->f$0:I
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda3;-><init>()V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;-><init>(ZZ)V
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->f$0:Z
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;-><init>(Z)V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->f$0:Z
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;-><init>(ZZ)V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;->f$0:Z
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;->f$1:Z
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;-><init>(ZZ)V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;->f$0:Z
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;->f$1:Z
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;-><clinit>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;-><init>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;-><clinit>()V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda4;->f$1:Z
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;-><init>()V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda6;-><init>()V
+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;-><init>(I)V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;->f$0:I
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda7;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;-><init>(Z)V
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda8;->f$0:Z
 Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;-><init>()V
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;->INSTANCE:Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;
-Landroid/net/wifi/WifiConfiguration$$ExternalSyntheticLambda9;->apply(Ljava/lang/Object;)Ljava/lang/Object;,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;-><init>()V
 Landroid/net/wifi/WifiConfiguration$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/WifiConfiguration;
 Landroid/net/wifi/WifiConfiguration$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -2026,6 +2460,7 @@
 Landroid/net/wifi/WifiConfiguration$GroupMgmtCipher;->varName:Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration$KeyMgmt;-><clinit>()V
 Landroid/net/wifi/WifiConfiguration$KeyMgmt;-><init>()V
+Landroid/net/wifi/WifiConfiguration$KeyMgmt;->DPP:I
 Landroid/net/wifi/WifiConfiguration$KeyMgmt;->FILS_SHA256:I
 Landroid/net/wifi/WifiConfiguration$KeyMgmt;->FILS_SHA384:I
 Landroid/net/wifi/WifiConfiguration$KeyMgmt;->FT_EAP:I
@@ -2090,9 +2525,11 @@
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getCandidateSecurityParams()Landroid/net/wifi/SecurityParams;
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getConnectChoice()Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getConnectChoiceRssi()I
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getDisableEndTime()J
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getDisableReasonByString(Ljava/lang/String;)I
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getDisableReasonCounter(I)I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getDisableTime()J,system-api,test-api
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getLastUsedSecurityParams()Landroid/net/wifi/SecurityParams;
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getMaxNetworkSelectionDisableReason()I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getNetworkSelectionBSSID()Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->getNetworkSelectionDisableReason()I,system-api,test-api
@@ -2114,11 +2551,13 @@
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mConnectChoiceRssi:I
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mHasEverConnected:Z
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mHasNeverDetectedCaptivePortal:Z
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mLastUsedSecurityParams:Landroid/net/wifi/SecurityParams;
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mNetworkSeclectionDisableCounter:[I
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mNetworkSelectionBSSID:Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mNetworkSelectionDisableReason:I
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mSeenInLastQualifiedNetworkSelection:Z
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mStatus:I
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mTemporarilyDisabledEndTime:J
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->mTemporarilyDisabledTimestamp:J
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->readFromParcel(Landroid/os/Parcel;)V
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setCandidate(Landroid/net/wifi/ScanResult;)V
@@ -2126,15 +2565,17 @@
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setCandidateSecurityParams(Landroid/net/wifi/SecurityParams;)V
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setConnectChoice(Ljava/lang/String;)V
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setConnectChoiceRssi(I)V
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setDisableEndTime(J)V
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setDisableReasonCounter(II)V
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setDisableTime(J)V
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setHasEverConnected(Z)V
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setHasNeverDetectedCaptivePortal(Z)V
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setLastUsedSecurityParams(Landroid/net/wifi/SecurityParams;)V
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setNetworkSelectionBSSID(Ljava/lang/String;)V
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setNetworkSelectionDisableReason(I)V
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setNetworkSelectionStatus(I)V
 Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->setSeenInLastQualifiedNetworkSelection(Z)V
-Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->writeToParcel(Landroid/os/Parcel;)V
+Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;->writeToParcel(Landroid/os/Parcel;I)V
 Landroid/net/wifi/WifiConfiguration$PairwiseCipher;-><clinit>()V
 Landroid/net/wifi/WifiConfiguration$PairwiseCipher;-><init>()V
 Landroid/net/wifi/WifiConfiguration$PairwiseCipher;->CCMP:I,public-api,system-api,test-api
@@ -2154,7 +2595,7 @@
 Landroid/net/wifi/WifiConfiguration$Protocol;->strings:[Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$Protocol;->varName:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration$RecentFailure;-><init>()V
-Landroid/net/wifi/WifiConfiguration$RecentFailure;-><init>(Landroid/net/wifi/WifiConfiguration$1;)V
+Landroid/net/wifi/WifiConfiguration$RecentFailure;-><init>(Landroid/net/wifi/WifiConfiguration$RecentFailure-IA;)V
 Landroid/net/wifi/WifiConfiguration$RecentFailure;->clear()V
 Landroid/net/wifi/WifiConfiguration$RecentFailure;->getAssociationStatus()I
 Landroid/net/wifi/WifiConfiguration$RecentFailure;->getLastUpdateTimeSinceBootMillis()J
@@ -2173,6 +2614,21 @@
 Landroid/net/wifi/WifiConfiguration$SuiteBCipher;->ECDHE_RSA:I
 Landroid/net/wifi/WifiConfiguration$SuiteBCipher;->strings:[Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration$SuiteBCipher;->varName:Ljava/lang/String;
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fgetmNetworkSelectionStatus(Landroid/net/wifi/WifiConfiguration;)Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fgetmSecurityParamsList(Landroid/net/wifi/WifiConfiguration;)Ljava/util/List;
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmBssidAllowlist(Landroid/net/wifi/WifiConfiguration;Ljava/util/List;)V
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmDeletionPriority(Landroid/net/wifi/WifiConfiguration;I)V
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmDppCSignKey(Landroid/net/wifi/WifiConfiguration;[B)V
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmDppConnector(Landroid/net/wifi/WifiConfiguration;[B)V
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmDppNetAccessKey(Landroid/net/wifi/WifiConfiguration;[B)V
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmDppPrivateEcKey(Landroid/net/wifi/WifiConfiguration;[B)V
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmIsDppConfigurator(Landroid/net/wifi/WifiConfiguration;Z)V
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmIsRepeaterEnabled(Landroid/net/wifi/WifiConfiguration;Z)V
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmPasspointManagementObjectTree(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)V
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmPasspointUniqueId(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)V
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmRandomizedMacAddress(Landroid/net/wifi/WifiConfiguration;Landroid/net/MacAddress;)V
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$fputmSubscriptionGroup(Landroid/net/wifi/WifiConfiguration;Landroid/os/ParcelUuid;)V
+Landroid/net/wifi/WifiConfiguration;->-$$Nest$smreadBitSet(Landroid/os/Parcel;)Ljava/util/BitSet;
 Landroid/net/wifi/WifiConfiguration;-><clinit>()V
 Landroid/net/wifi/WifiConfiguration;-><init>()V,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;-><init>(Landroid/net/wifi/WifiConfiguration;)V,public-api,system-api,test-api
@@ -2192,10 +2648,10 @@
 Landroid/net/wifi/WifiConfiguration;->METERED_OVERRIDE_METERED:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->METERED_OVERRIDE_NONE:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->METERED_OVERRIDE_NOT_METERED:I,system-api,test-api
-Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_AUTO:I,system-api,test-api
-Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_NONE:I,system-api,test-api
-Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_NON_PERSISTENT:I,system-api,test-api
-Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_PERSISTENT:I,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_AUTO:I,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_NONE:I,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_NON_PERSISTENT:I,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->RANDOMIZATION_PERSISTENT:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->RECENT_FAILURE_DISCONNECTION_AP_BUSY:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->RECENT_FAILURE_MBO_ASSOC_DISALLOWED_AIR_INTERFACE_OVERLOADED:I,system-api,test-api
@@ -2208,6 +2664,7 @@
 Landroid/net/wifi/WifiConfiguration;->RECENT_FAILURE_OCE_RSSI_BASED_ASSOCIATION_REJECTION:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->RECENT_FAILURE_POOR_CHANNEL_CONDITIONS:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->RECENT_FAILURE_REFUSED_TEMPORARILY:I,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->SECURITY_TYPE_DPP:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->SECURITY_TYPE_EAP:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->SECURITY_TYPE_EAP_SUITE_B:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->SECURITY_TYPE_EAP_WPA3_ENTERPRISE:I,public-api,system-api,test-api
@@ -2227,13 +2684,6 @@
 Landroid/net/wifi/WifiConfiguration;->SSID:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->TAG:Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration;->UNKNOWN_UID:I
-Landroid/net/wifi/WifiConfiguration;->access$100(Landroid/net/wifi/WifiConfiguration;)Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;
-Landroid/net/wifi/WifiConfiguration;->access$202(Landroid/net/wifi/WifiConfiguration;I)I
-Landroid/net/wifi/WifiConfiguration;->access$300(Landroid/os/Parcel;)Ljava/util/BitSet;
-Landroid/net/wifi/WifiConfiguration;->access$400(Landroid/net/wifi/WifiConfiguration;)Ljava/util/List;
-Landroid/net/wifi/WifiConfiguration;->access$502(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Ljava/lang/String;
-Landroid/net/wifi/WifiConfiguration;->access$602(Landroid/net/wifi/WifiConfiguration;Landroid/net/MacAddress;)Landroid/net/MacAddress;
-Landroid/net/wifi/WifiConfiguration;->access$702(Landroid/net/wifi/WifiConfiguration;Ljava/lang/String;)Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration;->addSecurityParams(I)V
 Landroid/net/wifi/WifiConfiguration;->addSecurityParams(Landroid/net/wifi/SecurityParams;)V
 Landroid/net/wifi/WifiConfiguration;->allowAutojoin:Z,system-api,test-api
@@ -2252,6 +2702,7 @@
 Landroid/net/wifi/WifiConfiguration;->convertLegacyFieldsToSecurityParamsIfNeeded()V
 Landroid/net/wifi/WifiConfiguration;->creatorName:Ljava/lang/String;,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->creatorUid:I,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->dbsSecondaryInternet:Z
 Landroid/net/wifi/WifiConfiguration;->defaultGwMacAddress:Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->dhcpServer:Ljava/lang/String;
@@ -2264,17 +2715,26 @@
 Landroid/net/wifi/WifiConfiguration;->ephemeral:Z
 Landroid/net/wifi/WifiConfiguration;->fromWifiNetworkSpecifier:Z,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->fromWifiNetworkSuggestion:Z,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getAllNetworkKeys()Ljava/util/Set;,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getAuthType()I,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getBssidAllowlist()Ljava/util/List;,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getBssidAllowlistInternal()Ljava/util/List;
 Landroid/net/wifi/WifiConfiguration;->getDefaultSecurityParams()Landroid/net/wifi/SecurityParams;
 Landroid/net/wifi/WifiConfiguration;->getDefaultSecurityType()Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration;->getDeletionPriority()I,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getDppCSignKey()[B,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getDppConnector()[B,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getDppNetAccessKey()[B,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->getDppPrivateEcKey()[B,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getHttpProxy()Landroid/net/ProxyInfo;,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment;
 Landroid/net/wifi/WifiConfiguration;->getIpConfiguration()Landroid/net/IpConfiguration;,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getKey()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getKeyIdForCredentials(Landroid/net/wifi/WifiConfiguration;)Ljava/lang/String;
+Landroid/net/wifi/WifiConfiguration;->getMacRandomizationSetting()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getMoTree()Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration;->getNetworkKey()Ljava/lang/String;
+Landroid/net/wifi/WifiConfiguration;->getNetworkKeyFromSecurityType(I)Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration;->getNetworkSelectionStatus()Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->getPasspointUniqueId()Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration;->getPrintableSsid()Ljava/lang/String;,system-api,test-api
@@ -2287,10 +2747,13 @@
 Landroid/net/wifi/WifiConfiguration;->getSecurityTypeName(I)Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration;->getSsidAndSecurityTypeString()Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration;
+Landroid/net/wifi/WifiConfiguration;->getSubscriptionGroup()Landroid/os/ParcelUuid;
 Landroid/net/wifi/WifiConfiguration;->hasNoInternetAccess()Z,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->hasWepKeys()Z
 Landroid/net/wifi/WifiConfiguration;->hiddenSSID:Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->hiddenSSIDVarName:Ljava/lang/String;
+Landroid/net/wifi/WifiConfiguration;->isCurrentlyConnected:Z
+Landroid/net/wifi/WifiConfiguration;->isDppConfigurator()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->isEnterprise()Z
 Landroid/net/wifi/WifiConfiguration;->isEphemeral()Z,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->isFilsSha256Enabled()Z
@@ -2303,10 +2766,12 @@
 Landroid/net/wifi/WifiConfiguration;->isNoInternetAccessExpected()Z,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->isOpenNetwork()Z
 Landroid/net/wifi/WifiConfiguration;->isPasspoint()Z,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->isRepeaterEnabled()Z,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->isSecurityType(I)Z
 Landroid/net/wifi/WifiConfiguration;->isSuiteBCipherEcdheEcdsaEnabled()Z
 Landroid/net/wifi/WifiConfiguration;->isSuiteBCipherEcdheRsaEnabled()Z
 Landroid/net/wifi/WifiConfiguration;->isValidMacAddressForRandomization(Landroid/net/MacAddress;)Z
+Landroid/net/wifi/WifiConfiguration;->isWpa3EnterpriseConfiguration()Z
 Landroid/net/wifi/WifiConfiguration;->lambda$addSecurityParams$1(ILandroid/net/wifi/SecurityParams;)Z
 Landroid/net/wifi/WifiConfiguration;->lambda$addSecurityParams$2(Landroid/net/wifi/SecurityParams;Landroid/net/wifi/SecurityParams;)Z
 Landroid/net/wifi/WifiConfiguration;->lambda$enableFils$9(ZZLandroid/net/wifi/SecurityParams;)V
@@ -2341,13 +2806,21 @@
 Landroid/net/wifi/WifiConfiguration;->lastUpdated:J
 Landroid/net/wifi/WifiConfiguration;->linkedConfigurations:Ljava/util/HashMap;
 Landroid/net/wifi/WifiConfiguration;->logTimeOfDay(J)Ljava/lang/String;
+Landroid/net/wifi/WifiConfiguration;->mBssidAllowlist:Ljava/util/List;
 Landroid/net/wifi/WifiConfiguration;->mDeletionPriority:I
+Landroid/net/wifi/WifiConfiguration;->mDppCSignKey:[B
+Landroid/net/wifi/WifiConfiguration;->mDppConnector:[B
+Landroid/net/wifi/WifiConfiguration;->mDppNetAccessKey:[B
+Landroid/net/wifi/WifiConfiguration;->mDppPrivateEcKey:[B
 Landroid/net/wifi/WifiConfiguration;->mIpConfiguration:Landroid/net/IpConfiguration;
+Landroid/net/wifi/WifiConfiguration;->mIsDppConfigurator:Z
+Landroid/net/wifi/WifiConfiguration;->mIsRepeaterEnabled:Z
 Landroid/net/wifi/WifiConfiguration;->mNetworkSelectionStatus:Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;
 Landroid/net/wifi/WifiConfiguration;->mPasspointManagementObjectTree:Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration;->mPasspointUniqueId:Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration;->mRandomizedMacAddress:Landroid/net/MacAddress;
 Landroid/net/wifi/WifiConfiguration;->mSecurityParamsList:Ljava/util/List;
+Landroid/net/wifi/WifiConfiguration;->mSubscriptionGroup:Landroid/os/ParcelUuid;
 Landroid/net/wifi/WifiConfiguration;->macRandomizationSetting:I,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->meteredHint:Z,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->meteredOverride:I,system-api,test-api
@@ -2374,18 +2847,24 @@
 Landroid/net/wifi/WifiConfiguration;->readBitSet(Landroid/os/Parcel;)Ljava/util/BitSet;
 Landroid/net/wifi/WifiConfiguration;->recentFailure:Landroid/net/wifi/WifiConfiguration$RecentFailure;
 Landroid/net/wifi/WifiConfiguration;->requirePmf:Z,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->restricted:Z
 Landroid/net/wifi/WifiConfiguration;->roamingConsortiumIds:[J,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->selfAdded:Z
+Landroid/net/wifi/WifiConfiguration;->setBssidAllowlist(Ljava/util/List;)V,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->setDeletionPriority(I)V,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->setDppConfigurator([B)V
+Landroid/net/wifi/WifiConfiguration;->setDppConnectionKeys([B[B[B)V
 Landroid/net/wifi/WifiConfiguration;->setHttpProxy(Landroid/net/ProxyInfo;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V
-Landroid/net/wifi/WifiConfiguration;->setIpConfiguration(Landroid/net/IpConfiguration;)V,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->setIpConfiguration(Landroid/net/IpConfiguration;)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiConfiguration;->setMacRandomizationSetting(I)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->setNetworkSelectionStatus(Landroid/net/wifi/WifiConfiguration$NetworkSelectionStatus;)V,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->setPasspointManagementObjectTree(Ljava/lang/String;)V
 Landroid/net/wifi/WifiConfiguration;->setPasspointUniqueId(Ljava/lang/String;)V
 Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V
 Landroid/net/wifi/WifiConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V
 Landroid/net/wifi/WifiConfiguration;->setRandomizedMacAddress(Landroid/net/MacAddress;)V
+Landroid/net/wifi/WifiConfiguration;->setRepeaterEnabled(Z)V,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->setSecurityParams(I)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->setSecurityParams(Landroid/net/wifi/SecurityParams;)V
 Landroid/net/wifi/WifiConfiguration;->setSecurityParams(Ljava/util/BitSet;)V
@@ -2393,6 +2872,7 @@
 Landroid/net/wifi/WifiConfiguration;->setSecurityParamsEnabled(IZ)V
 Landroid/net/wifi/WifiConfiguration;->setSecurityParamsIsAddedByAutoUpgrade(IZ)V
 Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V
+Landroid/net/wifi/WifiConfiguration;->setSubscriptionGroup(Landroid/os/ParcelUuid;)V
 Landroid/net/wifi/WifiConfiguration;->shared:Z,system-api,test-api
 Landroid/net/wifi/WifiConfiguration;->ssidVarName:Ljava/lang/String;
 Landroid/net/wifi/WifiConfiguration;->status:I,public-api,system-api,test-api
@@ -2423,7 +2903,7 @@
 Landroid/net/wifi/WifiConnectedSessionInfo$Builder;->setUserSelected(Z)Landroid/net/wifi/WifiConnectedSessionInfo$Builder;,system-api,test-api
 Landroid/net/wifi/WifiConnectedSessionInfo;-><clinit>()V
 Landroid/net/wifi/WifiConnectedSessionInfo;-><init>(IZ)V
-Landroid/net/wifi/WifiConnectedSessionInfo;-><init>(IZLandroid/net/wifi/WifiConnectedSessionInfo$1;)V
+Landroid/net/wifi/WifiConnectedSessionInfo;-><init>(IZLandroid/net/wifi/WifiConnectedSessionInfo-IA;)V
 Landroid/net/wifi/WifiConnectedSessionInfo;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
 Landroid/net/wifi/WifiConnectedSessionInfo;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiConnectedSessionInfo;->getSessionId()I,system-api,test-api
@@ -2431,6 +2911,32 @@
 Landroid/net/wifi/WifiConnectedSessionInfo;->mIsUserSelected:Z
 Landroid/net/wifi/WifiConnectedSessionInfo;->mSessionId:I
 Landroid/net/wifi/WifiConnectedSessionInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiContext$$ExternalSyntheticLambda0;-><init>()V
+Landroid/net/wifi/WifiContext$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiContext$$ExternalSyntheticLambda1;-><init>()V
+Landroid/net/wifi/WifiContext$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiContext;-><init>(Landroid/content/Context;)V
+Landroid/net/wifi/WifiContext;->ACTION_RESOURCES_APK:Ljava/lang/String;
+Landroid/net/wifi/WifiContext;->ACTION_WIFI_DIALOG_APK:Ljava/lang/String;
+Landroid/net/wifi/WifiContext;->SERVICE_WIFI_PACKAGE_NAME:Ljava/lang/String;
+Landroid/net/wifi/WifiContext;->TAG:Ljava/lang/String;
+Landroid/net/wifi/WifiContext;->getApkPkgNameForAction(Ljava/lang/String;)Ljava/lang/String;
+Landroid/net/wifi/WifiContext;->getAssets()Landroid/content/res/AssetManager;,public-api,system-api,test-api
+Landroid/net/wifi/WifiContext;->getResources()Landroid/content/res/Resources;,public-api,system-api,test-api
+Landroid/net/wifi/WifiContext;->getResourcesApkContext()Landroid/content/Context;
+Landroid/net/wifi/WifiContext;->getServiceWifiPackageName()Ljava/lang/String;
+Landroid/net/wifi/WifiContext;->getStringResourceWrapper(II)Landroid/net/wifi/WifiStringResourceWrapper;
+Landroid/net/wifi/WifiContext;->getTheme()Landroid/content/res/Resources$Theme;,public-api,system-api,test-api
+Landroid/net/wifi/WifiContext;->getWifiDialogApkPkgName()Ljava/lang/String;
+Landroid/net/wifi/WifiContext;->getWifiOverlayApkPkgName()Ljava/lang/String;
+Landroid/net/wifi/WifiContext;->lambda$getApkPkgNameForAction$0(Landroid/content/pm/ResolveInfo;)Z
+Landroid/net/wifi/WifiContext;->lambda$getApkPkgNameForAction$1(Landroid/content/pm/ResolveInfo;)Ljava/lang/String;
+Landroid/net/wifi/WifiContext;->mWifiAssetsFromApk:Landroid/content/res/AssetManager;
+Landroid/net/wifi/WifiContext;->mWifiDialogApkPkgName:Ljava/lang/String;
+Landroid/net/wifi/WifiContext;->mWifiOverlayApkPkgName:Ljava/lang/String;
+Landroid/net/wifi/WifiContext;->mWifiResourcesFromApk:Landroid/content/res/Resources;
+Landroid/net/wifi/WifiContext;->mWifiThemeFromApk:Landroid/content/res/Resources$Theme;
+Landroid/net/wifi/WifiContext;->resetResourceCache()V
 Landroid/net/wifi/WifiEnterpriseConfig$1;-><init>()V
 Landroid/net/wifi/WifiEnterpriseConfig$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/WifiEnterpriseConfig;
 Landroid/net/wifi/WifiEnterpriseConfig$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -2464,6 +2970,18 @@
 Landroid/net/wifi/WifiEnterpriseConfig$Phase2;->strings:[Ljava/lang/String;
 Landroid/net/wifi/WifiEnterpriseConfig$SupplicantLoader;->loadValue(Ljava/lang/String;)Ljava/lang/String;
 Landroid/net/wifi/WifiEnterpriseConfig$SupplicantSaver;->saveValue(Ljava/lang/String;Ljava/lang/String;)Z
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fgetmFields(Landroid/net/wifi/WifiEnterpriseConfig;)Ljava/util/HashMap;
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmCaCerts(Landroid/net/wifi/WifiEnterpriseConfig;[Ljava/security/cert/X509Certificate;)V
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmClientCertificateChain(Landroid/net/wifi/WifiEnterpriseConfig;[Ljava/security/cert/X509Certificate;)V
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmClientPrivateKey(Landroid/net/wifi/WifiEnterpriseConfig;Ljava/security/PrivateKey;)V
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmEapMethod(Landroid/net/wifi/WifiEnterpriseConfig;I)V
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmIsAppInstalledCaCert(Landroid/net/wifi/WifiEnterpriseConfig;Z)V
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmIsAppInstalledDeviceKeyAndCert(Landroid/net/wifi/WifiEnterpriseConfig;Z)V
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmIsTrustOnFirstUseEnabled(Landroid/net/wifi/WifiEnterpriseConfig;Z)V
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmKeyChainAlias(Landroid/net/wifi/WifiEnterpriseConfig;Ljava/lang/String;)V
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmOcsp(Landroid/net/wifi/WifiEnterpriseConfig;I)V
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmPhase2Method(Landroid/net/wifi/WifiEnterpriseConfig;I)V
+Landroid/net/wifi/WifiEnterpriseConfig;->-$$Nest$fputmUserApproveNoCaCert(Landroid/net/wifi/WifiEnterpriseConfig;Z)V
 Landroid/net/wifi/WifiEnterpriseConfig;-><clinit>()V
 Landroid/net/wifi/WifiEnterpriseConfig;-><init>()V,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;-><init>(Landroid/net/wifi/WifiEnterpriseConfig;)V,public-api,system-api,test-api
@@ -2514,21 +3032,12 @@
 Landroid/net/wifi/WifiEnterpriseConfig;->WAPI_AS_CERTIFICATE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->WAPI_CERT_SUITE_KEY:Ljava/lang/String;
 Landroid/net/wifi/WifiEnterpriseConfig;->WAPI_USER_CERTIFICATE:Ljava/lang/String;,public-api,system-api,test-api
-Landroid/net/wifi/WifiEnterpriseConfig;->access$000(Landroid/net/wifi/WifiEnterpriseConfig;)Ljava/util/HashMap;
-Landroid/net/wifi/WifiEnterpriseConfig;->access$102(Landroid/net/wifi/WifiEnterpriseConfig;I)I
-Landroid/net/wifi/WifiEnterpriseConfig;->access$202(Landroid/net/wifi/WifiEnterpriseConfig;I)I
-Landroid/net/wifi/WifiEnterpriseConfig;->access$302(Landroid/net/wifi/WifiEnterpriseConfig;[Ljava/security/cert/X509Certificate;)[Ljava/security/cert/X509Certificate;
-Landroid/net/wifi/WifiEnterpriseConfig;->access$402(Landroid/net/wifi/WifiEnterpriseConfig;Ljava/security/PrivateKey;)Ljava/security/PrivateKey;
-Landroid/net/wifi/WifiEnterpriseConfig;->access$502(Landroid/net/wifi/WifiEnterpriseConfig;[Ljava/security/cert/X509Certificate;)[Ljava/security/cert/X509Certificate;
-Landroid/net/wifi/WifiEnterpriseConfig;->access$602(Landroid/net/wifi/WifiEnterpriseConfig;Ljava/lang/String;)Ljava/lang/String;
-Landroid/net/wifi/WifiEnterpriseConfig;->access$702(Landroid/net/wifi/WifiEnterpriseConfig;Z)Z
-Landroid/net/wifi/WifiEnterpriseConfig;->access$802(Landroid/net/wifi/WifiEnterpriseConfig;Z)Z
-Landroid/net/wifi/WifiEnterpriseConfig;->access$902(Landroid/net/wifi/WifiEnterpriseConfig;I)I
 Landroid/net/wifi/WifiEnterpriseConfig;->convertToQuotedString(Ljava/lang/String;)Ljava/lang/String;
 Landroid/net/wifi/WifiEnterpriseConfig;->copyFrom(Landroid/net/wifi/WifiEnterpriseConfig;ZLjava/lang/String;)V
 Landroid/net/wifi/WifiEnterpriseConfig;->copyFromExternal(Landroid/net/wifi/WifiEnterpriseConfig;Ljava/lang/String;)V
 Landroid/net/wifi/WifiEnterpriseConfig;->decodeCaCertificateAlias(Ljava/lang/String;)Ljava/lang/String;
 Landroid/net/wifi/WifiEnterpriseConfig;->describeContents()I,public-api,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->enableTrustOnFirstUse(Z)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->encodeCaCertificateAlias(Ljava/lang/String;)Ljava/lang/String;
 Landroid/net/wifi/WifiEnterpriseConfig;->getAltSubjectMatch()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->getAnonymousIdentity()Ljava/lang/String;,public-api,system-api,test-api
@@ -2555,9 +3064,11 @@
 Landroid/net/wifi/WifiEnterpriseConfig;->getPhase2Method()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->getPlmn()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->getRealm()Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->getSelectedRcoi()J
 Landroid/net/wifi/WifiEnterpriseConfig;->getStringIndex([Ljava/lang/String;Ljava/lang/String;I)I
 Landroid/net/wifi/WifiEnterpriseConfig;->getSubjectMatch()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->getWapiCertSuite()Ljava/lang/String;,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->hasCaCertificate()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->initIsAppInstalledCaCert(Z)V
 Landroid/net/wifi/WifiEnterpriseConfig;->initIsAppInstalledDeviceKeyAndCert(Z)V
 Landroid/net/wifi/WifiEnterpriseConfig;->isAppInstalledCaCert()Z
@@ -2568,6 +3079,8 @@
 Landroid/net/wifi/WifiEnterpriseConfig;->isMandatoryParameterSetForServerCertValidation()Z
 Landroid/net/wifi/WifiEnterpriseConfig;->isServerCertValidationEnabled()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->isSuiteBCipherCert(Ljava/security/cert/X509Certificate;)Z
+Landroid/net/wifi/WifiEnterpriseConfig;->isTrustOnFirstUseEnabled()Z,public-api,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->isUserApproveNoCaCert()Z
 Landroid/net/wifi/WifiEnterpriseConfig;->loadFromSupplicant(Landroid/net/wifi/WifiEnterpriseConfig$SupplicantLoader;)V
 Landroid/net/wifi/WifiEnterpriseConfig;->mCaCerts:[Ljava/security/cert/X509Certificate;
 Landroid/net/wifi/WifiEnterpriseConfig;->mClientCertificateChain:[Ljava/security/cert/X509Certificate;
@@ -2576,9 +3089,12 @@
 Landroid/net/wifi/WifiEnterpriseConfig;->mFields:Ljava/util/HashMap;
 Landroid/net/wifi/WifiEnterpriseConfig;->mIsAppInstalledCaCert:Z
 Landroid/net/wifi/WifiEnterpriseConfig;->mIsAppInstalledDeviceKeyAndCert:Z
+Landroid/net/wifi/WifiEnterpriseConfig;->mIsTrustOnFirstUseEnabled:Z
 Landroid/net/wifi/WifiEnterpriseConfig;->mKeyChainAlias:Ljava/lang/String;
 Landroid/net/wifi/WifiEnterpriseConfig;->mOcsp:I
 Landroid/net/wifi/WifiEnterpriseConfig;->mPhase2Method:I
+Landroid/net/wifi/WifiEnterpriseConfig;->mSelectedRcoi:J
+Landroid/net/wifi/WifiEnterpriseConfig;->mUserApproveNoCaCert:Z
 Landroid/net/wifi/WifiEnterpriseConfig;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String;
 Landroid/net/wifi/WifiEnterpriseConfig;->resetCaCertificate()V
 Landroid/net/wifi/WifiEnterpriseConfig;->resetClientKeyEntry()V
@@ -2588,6 +3104,7 @@
 Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificate(Ljava/security/cert/X509Certificate;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateAlias(Ljava/lang/String;)V
 Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateAliases([Ljava/lang/String;)V,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateForTrustOnFirstUse(Ljava/security/cert/X509Certificate;)V
 Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificates([Ljava/security/cert/X509Certificate;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->setCaPath(Ljava/lang/String;)V,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->setClientCertificateAlias(Ljava/lang/String;)V,system-api,test-api
@@ -2605,43 +3122,33 @@
 Landroid/net/wifi/WifiEnterpriseConfig;->setPhase2Method(I)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->setPlmn(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->setRealm(Ljava/lang/String;)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->setSelectedRcoi(J)V
 Landroid/net/wifi/WifiEnterpriseConfig;->setSubjectMatch(Ljava/lang/String;)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiEnterpriseConfig;->setUserApproveNoCaCert(Z)V
 Landroid/net/wifi/WifiEnterpriseConfig;->setWapiCertSuite(Ljava/lang/String;)V,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiEnterpriseConfig;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda0;-><clinit>()V
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda0;-><init>()V
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda0;->INSTANCE:Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda0;
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda0;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda1;-><clinit>()V
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda1;-><init>()V
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda1;->INSTANCE:Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda1;
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda1;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda2;-><clinit>()V
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda2;-><init>()V
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda2;->INSTANCE:Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda2;
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda2;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda3;-><clinit>()V
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda3;-><init>()V
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda3;->INSTANCE:Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda3;
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda3;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda4;-><clinit>()V
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda4;-><init>()V
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda4;->INSTANCE:Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda4;
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda4;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda5;-><clinit>()V
+Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda4;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
 Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda5;-><init>()V
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda5;->INSTANCE:Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda5;
-Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda5;->createService(Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
+Landroid/net/wifi/WifiFrameworkInitializer$$ExternalSyntheticLambda5;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
+Landroid/net/wifi/WifiFrameworkInitializer$NoPreloadHolder;->-$$Nest$sfgetINSTANCE()Landroid/os/HandlerThread;
 Landroid/net/wifi/WifiFrameworkInitializer$NoPreloadHolder;-><clinit>()V
 Landroid/net/wifi/WifiFrameworkInitializer$NoPreloadHolder;-><init>()V
 Landroid/net/wifi/WifiFrameworkInitializer$NoPreloadHolder;->INSTANCE:Landroid/os/HandlerThread;
-Landroid/net/wifi/WifiFrameworkInitializer$NoPreloadHolder;->access$000()Landroid/os/HandlerThread;
 Landroid/net/wifi/WifiFrameworkInitializer$NoPreloadHolder;->createInstance()Landroid/os/HandlerThread;
 Landroid/net/wifi/WifiFrameworkInitializer;-><init>()V
 Landroid/net/wifi/WifiFrameworkInitializer;->getInstanceLooper()Landroid/os/Looper;
 Landroid/net/wifi/WifiFrameworkInitializer;->lambda$registerServiceWrappers$0(Landroid/content/Context;Landroid/os/IBinder;)Landroid/net/wifi/WifiManager;
-Landroid/net/wifi/WifiFrameworkInitializer;->lambda$registerServiceWrappers$1(Landroid/os/IBinder;)Landroid/net/wifi/p2p/WifiP2pManager;
+Landroid/net/wifi/WifiFrameworkInitializer;->lambda$registerServiceWrappers$1(Landroid/content/Context;Landroid/os/IBinder;)Landroid/net/wifi/p2p/WifiP2pManager;
 Landroid/net/wifi/WifiFrameworkInitializer;->lambda$registerServiceWrappers$2(Landroid/content/Context;Landroid/os/IBinder;)Landroid/net/wifi/aware/WifiAwareManager;
 Landroid/net/wifi/WifiFrameworkInitializer;->lambda$registerServiceWrappers$3(Landroid/content/Context;Landroid/os/IBinder;)Landroid/net/wifi/WifiScanner;
 Landroid/net/wifi/WifiFrameworkInitializer;->lambda$registerServiceWrappers$4(Landroid/content/Context;Landroid/os/IBinder;)Landroid/net/wifi/rtt/WifiRttManager;
@@ -2652,20 +3159,60 @@
 Landroid/net/wifi/WifiInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo$1;->newArray(I)[Landroid/net/wifi/WifiInfo;
 Landroid/net/wifi/WifiInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/WifiInfo$2;-><init>(Landroid/net/wifi/WifiInfo;)V
+Landroid/net/wifi/WifiInfo$2;->compare(Landroid/net/wifi/MloLink;Landroid/net/wifi/MloLink;)I
+Landroid/net/wifi/WifiInfo$2;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiInfo$2;->this$0:Landroid/net/wifi/WifiInfo;
 Landroid/net/wifi/WifiInfo$Builder;-><init>()V,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo$Builder;->build()Landroid/net/wifi/WifiInfo;,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo$Builder;->mWifiInfo:Landroid/net/wifi/WifiInfo;
+Landroid/net/wifi/WifiInfo$Builder;->setAffiliatedMloLinks(Ljava/util/List;)Landroid/net/wifi/WifiInfo$Builder;
+Landroid/net/wifi/WifiInfo$Builder;->setApMldMacAddress(Landroid/net/MacAddress;)Landroid/net/wifi/WifiInfo$Builder;
+Landroid/net/wifi/WifiInfo$Builder;->setApMloLinkId(I)Landroid/net/wifi/WifiInfo$Builder;
 Landroid/net/wifi/WifiInfo$Builder;->setBssid(Ljava/lang/String;)Landroid/net/wifi/WifiInfo$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo$Builder;->setCurrentSecurityType(I)Landroid/net/wifi/WifiInfo$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo$Builder;->setNetworkId(I)Landroid/net/wifi/WifiInfo$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo$Builder;->setRssi(I)Landroid/net/wifi/WifiInfo$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo$Builder;->setSsid([B)Landroid/net/wifi/WifiInfo$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmAffiliatedMloLinks(Landroid/net/wifi/WifiInfo;Ljava/util/List;)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmApMldMacAddress(Landroid/net/wifi/WifiInfo;Landroid/net/MacAddress;)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmApMloLinkId(Landroid/net/wifi/WifiInfo;I)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmBSSID(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmCarrierMerged(Landroid/net/wifi/WifiInfo;Z)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmEphemeral(Landroid/net/wifi/WifiInfo;Z)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmFqdn(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmInformationElements(Landroid/net/wifi/WifiInfo;Ljava/util/List;)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmIsPrimary(Landroid/net/wifi/WifiInfo;I)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmIsUsable(Landroid/net/wifi/WifiInfo;Z)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmLostTxPacketsPerSecond(Landroid/net/wifi/WifiInfo;D)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmMacAddress(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmMaxSupportedRxLinkSpeed(Landroid/net/wifi/WifiInfo;I)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmMaxSupportedTxLinkSpeed(Landroid/net/wifi/WifiInfo;I)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmMeteredHint(Landroid/net/wifi/WifiInfo;Z)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmNetworkKey(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmOemPaid(Landroid/net/wifi/WifiInfo;Z)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmOemPrivate(Landroid/net/wifi/WifiInfo;Z)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmOsuAp(Landroid/net/wifi/WifiInfo;Z)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmPasspointUniqueId(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmProviderFriendlyName(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmRequestingPackageName(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmRestricted(Landroid/net/wifi/WifiInfo;Z)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmSecurityType(Landroid/net/wifi/WifiInfo;I)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmSubscriptionId(Landroid/net/wifi/WifiInfo;I)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmSuccessfulRxPacketsPerSecond(Landroid/net/wifi/WifiInfo;D)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmSuccessfulTxPacketsPerSecond(Landroid/net/wifi/WifiInfo;D)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmSupplicantState(Landroid/net/wifi/WifiInfo;Landroid/net/wifi/SupplicantState;)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmTrusted(Landroid/net/wifi/WifiInfo;Z)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmTxRetriedTxPacketsPerSecond(Landroid/net/wifi/WifiInfo;D)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmWifiSsid(Landroid/net/wifi/WifiInfo;Landroid/net/wifi/WifiSsid;)V
+Landroid/net/wifi/WifiInfo;->-$$Nest$fputmWifiStandard(Landroid/net/wifi/WifiInfo;I)V
 Landroid/net/wifi/WifiInfo;-><clinit>()V
 Landroid/net/wifi/WifiInfo;-><init>()V
 Landroid/net/wifi/WifiInfo;-><init>(Landroid/net/wifi/WifiInfo;)V
 Landroid/net/wifi/WifiInfo;-><init>(Landroid/net/wifi/WifiInfo;J)V
 Landroid/net/wifi/WifiInfo;->CREATOR:Landroid/os/Parcelable$Creator;
 Landroid/net/wifi/WifiInfo;->DEFAULT_MAC_ADDRESS:Ljava/lang/String;,system-api,test-api
+Landroid/net/wifi/WifiInfo;->DPM_SECURITY_TYPE_UNKNOWN:I
 Landroid/net/wifi/WifiInfo;->FREQUENCY_UNITS:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->INVALID_RSSI:I,system-api,test-api
 Landroid/net/wifi/WifiInfo;->IS_PRIMARY_FALSE:I
@@ -2675,6 +3222,7 @@
 Landroid/net/wifi/WifiInfo;->LINK_SPEED_UNKNOWN:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->MAX_RSSI:I
 Landroid/net/wifi/WifiInfo;->MIN_RSSI:I
+Landroid/net/wifi/WifiInfo;->SECURITY_TYPE_DPP:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->SECURITY_TYPE_EAP:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->SECURITY_TYPE_EAP_WPA3_ENTERPRISE:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT:I,public-api,system-api,test-api
@@ -2690,36 +3238,14 @@
 Landroid/net/wifi/WifiInfo;->SECURITY_TYPE_WAPI_PSK:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->SECURITY_TYPE_WEP:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->TAG:Ljava/lang/String;
-Landroid/net/wifi/WifiInfo;->access$002(Landroid/net/wifi/WifiInfo;Landroid/net/wifi/WifiSsid;)Landroid/net/wifi/WifiSsid;
-Landroid/net/wifi/WifiInfo;->access$1002(Landroid/net/wifi/WifiInfo;D)D
-Landroid/net/wifi/WifiInfo;->access$102(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)Ljava/lang/String;
-Landroid/net/wifi/WifiInfo;->access$1102(Landroid/net/wifi/WifiInfo;D)D
-Landroid/net/wifi/WifiInfo;->access$1202(Landroid/net/wifi/WifiInfo;D)D
-Landroid/net/wifi/WifiInfo;->access$1302(Landroid/net/wifi/WifiInfo;Landroid/net/wifi/SupplicantState;)Landroid/net/wifi/SupplicantState;
-Landroid/net/wifi/WifiInfo;->access$1402(Landroid/net/wifi/WifiInfo;Z)Z
-Landroid/net/wifi/WifiInfo;->access$1502(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)Ljava/lang/String;
-Landroid/net/wifi/WifiInfo;->access$1602(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)Ljava/lang/String;
-Landroid/net/wifi/WifiInfo;->access$1702(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)Ljava/lang/String;
-Landroid/net/wifi/WifiInfo;->access$1802(Landroid/net/wifi/WifiInfo;I)I
-Landroid/net/wifi/WifiInfo;->access$1902(Landroid/net/wifi/WifiInfo;I)I
-Landroid/net/wifi/WifiInfo;->access$2002(Landroid/net/wifi/WifiInfo;I)I
-Landroid/net/wifi/WifiInfo;->access$202(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)Ljava/lang/String;
-Landroid/net/wifi/WifiInfo;->access$2102(Landroid/net/wifi/WifiInfo;Ljava/lang/String;)Ljava/lang/String;
-Landroid/net/wifi/WifiInfo;->access$2202(Landroid/net/wifi/WifiInfo;I)I
-Landroid/net/wifi/WifiInfo;->access$2302(Landroid/net/wifi/WifiInfo;Ljava/util/List;)Ljava/util/List;
-Landroid/net/wifi/WifiInfo;->access$2402(Landroid/net/wifi/WifiInfo;I)I
-Landroid/net/wifi/WifiInfo;->access$2502(Landroid/net/wifi/WifiInfo;I)I
-Landroid/net/wifi/WifiInfo;->access$302(Landroid/net/wifi/WifiInfo;Z)Z
-Landroid/net/wifi/WifiInfo;->access$402(Landroid/net/wifi/WifiInfo;Z)Z
-Landroid/net/wifi/WifiInfo;->access$502(Landroid/net/wifi/WifiInfo;Z)Z
-Landroid/net/wifi/WifiInfo;->access$602(Landroid/net/wifi/WifiInfo;Z)Z
-Landroid/net/wifi/WifiInfo;->access$702(Landroid/net/wifi/WifiInfo;Z)Z
-Landroid/net/wifi/WifiInfo;->access$802(Landroid/net/wifi/WifiInfo;Z)Z
-Landroid/net/wifi/WifiInfo;->access$902(Landroid/net/wifi/WifiInfo;D)D
 Landroid/net/wifi/WifiInfo;->clearCurrentSecurityType()V
-Landroid/net/wifi/WifiInfo;->convertSecurityTypeToWifiInfo(I)I
+Landroid/net/wifi/WifiInfo;->convertSecurityTypeToDpmWifiSecurity(I)I
+Landroid/net/wifi/WifiInfo;->convertWifiConfigurationSecurityType(I)I
 Landroid/net/wifi/WifiInfo;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiInfo;->getAffiliatedMloLinks()Ljava/util/List;,public-api,system-api,test-api
+Landroid/net/wifi/WifiInfo;->getApMldMacAddress()Landroid/net/MacAddress;,public-api,system-api,test-api
+Landroid/net/wifi/WifiInfo;->getApMloLinkId()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getApplicableRedactions()J,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getBSSID()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getCurrentSecurityType()I,public-api,system-api,test-api
@@ -2735,6 +3261,7 @@
 Landroid/net/wifi/WifiInfo;->getMaxSupportedTxLinkSpeedMbps()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getMeteredHint()Z
 Landroid/net/wifi/WifiInfo;->getNetworkId()I,public-api,system-api,test-api
+Landroid/net/wifi/WifiInfo;->getNetworkKey()Ljava/lang/String;,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getPasspointFqdn()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getPasspointProviderFriendlyName()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getPasspointUniqueId()Ljava/lang/String;
@@ -2744,6 +3271,7 @@
 Landroid/net/wifi/WifiInfo;->getRxLinkSpeedMbps()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getSSID()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getScore()I,system-api,test-api
+Landroid/net/wifi/WifiInfo;->getSortedMloLinkList(Ljava/util/List;)Ljava/util/List;
 Landroid/net/wifi/WifiInfo;->getSubscriptionId()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getSuccessfulRxPacketsPerSecond()D,system-api,test-api
 Landroid/net/wifi/WifiInfo;->getSuccessfulTxPacketsPerSecond()D,system-api,test-api
@@ -2763,7 +3291,12 @@
 Landroid/net/wifi/WifiInfo;->isOsuAp()Z,system-api,test-api
 Landroid/net/wifi/WifiInfo;->isPasspointAp()Z,system-api,test-api
 Landroid/net/wifi/WifiInfo;->isPrimary()Z,system-api,test-api
+Landroid/net/wifi/WifiInfo;->isRestricted()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->isTrusted()Z,system-api,test-api
+Landroid/net/wifi/WifiInfo;->isUsable()Z
+Landroid/net/wifi/WifiInfo;->mAffiliatedMloLinks:Ljava/util/List;
+Landroid/net/wifi/WifiInfo;->mApMldMacAddress:Landroid/net/MacAddress;
+Landroid/net/wifi/WifiInfo;->mApMloLinkId:I
 Landroid/net/wifi/WifiInfo;->mBSSID:Ljava/lang/String;
 Landroid/net/wifi/WifiInfo;->mCarrierMerged:Z
 Landroid/net/wifi/WifiInfo;->mEphemeral:Z
@@ -2771,7 +3304,9 @@
 Landroid/net/wifi/WifiInfo;->mFrequency:I
 Landroid/net/wifi/WifiInfo;->mInformationElements:Ljava/util/List;
 Landroid/net/wifi/WifiInfo;->mIpAddress:Ljava/net/InetAddress;
+Landroid/net/wifi/WifiInfo;->mIsHiddenSsid:Z
 Landroid/net/wifi/WifiInfo;->mIsPrimary:I
+Landroid/net/wifi/WifiInfo;->mIsUsable:Z
 Landroid/net/wifi/WifiInfo;->mLinkSpeed:I
 Landroid/net/wifi/WifiInfo;->mLostTxPacketsPerSecond:D
 Landroid/net/wifi/WifiInfo;->mMacAddress:Ljava/lang/String;
@@ -2779,12 +3314,14 @@
 Landroid/net/wifi/WifiInfo;->mMaxSupportedTxLinkSpeed:I
 Landroid/net/wifi/WifiInfo;->mMeteredHint:Z
 Landroid/net/wifi/WifiInfo;->mNetworkId:I
+Landroid/net/wifi/WifiInfo;->mNetworkKey:Ljava/lang/String;
 Landroid/net/wifi/WifiInfo;->mOemPaid:Z
 Landroid/net/wifi/WifiInfo;->mOemPrivate:Z
 Landroid/net/wifi/WifiInfo;->mOsuAp:Z
 Landroid/net/wifi/WifiInfo;->mPasspointUniqueId:Ljava/lang/String;
 Landroid/net/wifi/WifiInfo;->mProviderFriendlyName:Ljava/lang/String;
 Landroid/net/wifi/WifiInfo;->mRequestingPackageName:Ljava/lang/String;
+Landroid/net/wifi/WifiInfo;->mRestricted:Z
 Landroid/net/wifi/WifiInfo;->mRssi:I
 Landroid/net/wifi/WifiInfo;->mRxLinkSpeed:I
 Landroid/net/wifi/WifiInfo;->mSecurityType:I
@@ -2801,15 +3338,20 @@
 Landroid/net/wifi/WifiInfo;->makeCopy(J)Landroid/net/wifi/WifiInfo;,public-api,system-api,test-api
 Landroid/net/wifi/WifiInfo;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String;
 Landroid/net/wifi/WifiInfo;->reset()V
+Landroid/net/wifi/WifiInfo;->resetMultiLinkInfo()V
 Landroid/net/wifi/WifiInfo;->rxSuccess:J
 Landroid/net/wifi/WifiInfo;->sanitizeSsid(Ljava/lang/String;)Ljava/lang/String;,system-api,test-api
 Landroid/net/wifi/WifiInfo;->score:I
+Landroid/net/wifi/WifiInfo;->setAffiliatedMloLinks(Ljava/util/List;)V
+Landroid/net/wifi/WifiInfo;->setApMldMacAddress(Landroid/net/MacAddress;)V
+Landroid/net/wifi/WifiInfo;->setApMloLinkId(I)V
 Landroid/net/wifi/WifiInfo;->setBSSID(Ljava/lang/String;)V
 Landroid/net/wifi/WifiInfo;->setCarrierMerged(Z)V
 Landroid/net/wifi/WifiInfo;->setCurrentSecurityType(I)V
 Landroid/net/wifi/WifiInfo;->setEphemeral(Z)V
 Landroid/net/wifi/WifiInfo;->setFQDN(Ljava/lang/String;)V
 Landroid/net/wifi/WifiInfo;->setFrequency(I)V
+Landroid/net/wifi/WifiInfo;->setHiddenSSID(Z)V
 Landroid/net/wifi/WifiInfo;->setInetAddress(Ljava/net/InetAddress;)V
 Landroid/net/wifi/WifiInfo;->setInformationElements(Ljava/util/List;)V
 Landroid/net/wifi/WifiInfo;->setIsPrimary(Z)V
@@ -2820,12 +3362,14 @@
 Landroid/net/wifi/WifiInfo;->setMaxSupportedTxLinkSpeedMbps(I)V
 Landroid/net/wifi/WifiInfo;->setMeteredHint(Z)V
 Landroid/net/wifi/WifiInfo;->setNetworkId(I)V
+Landroid/net/wifi/WifiInfo;->setNetworkKey(Ljava/lang/String;)V
 Landroid/net/wifi/WifiInfo;->setOemPaid(Z)V
 Landroid/net/wifi/WifiInfo;->setOemPrivate(Z)V
 Landroid/net/wifi/WifiInfo;->setOsuAp(Z)V
 Landroid/net/wifi/WifiInfo;->setPasspointUniqueId(Ljava/lang/String;)V
 Landroid/net/wifi/WifiInfo;->setProviderFriendlyName(Ljava/lang/String;)V
 Landroid/net/wifi/WifiInfo;->setRequestingPackageName(Ljava/lang/String;)V
+Landroid/net/wifi/WifiInfo;->setRestricted(Z)V
 Landroid/net/wifi/WifiInfo;->setRetriedTxPacketsRate(D)V
 Landroid/net/wifi/WifiInfo;->setRssi(I)V
 Landroid/net/wifi/WifiInfo;->setRxLinkSpeedMbps(I)V
@@ -2838,6 +3382,7 @@
 Landroid/net/wifi/WifiInfo;->setSupplicantState(Ljava/lang/String;)V
 Landroid/net/wifi/WifiInfo;->setTrusted(Z)V
 Landroid/net/wifi/WifiInfo;->setTxLinkSpeedMbps(I)V
+Landroid/net/wifi/WifiInfo;->setUsable(Z)V
 Landroid/net/wifi/WifiInfo;->setWifiStandard(I)V
 Landroid/net/wifi/WifiInfo;->shouldRedactLocalMacAddressFields(J)Z
 Landroid/net/wifi/WifiInfo;->shouldRedactLocationSensitiveFields(J)Z
@@ -2847,48 +3392,89 @@
 Landroid/net/wifi/WifiInfo;->txBad:J
 Landroid/net/wifi/WifiInfo;->txRetries:J
 Landroid/net/wifi/WifiInfo;->txSuccess:J
+Landroid/net/wifi/WifiInfo;->updateMloLinkStaAddress(ILandroid/net/MacAddress;)Z
+Landroid/net/wifi/WifiInfo;->updateMloLinkState(II)Z
 Landroid/net/wifi/WifiInfo;->valueOf(Ljava/lang/String;)Landroid/net/wifi/SupplicantState;
 Landroid/net/wifi/WifiInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V
-Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;
-Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->f$1:I
-Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->f$2:Z
-Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->f$3:Landroid/net/wifi/WifiUsabilityStatsEntry;
+Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;-><init>(Ljava/util/function/Consumer;Z)V
+Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->f$0:Ljava/util/function/Consumer;
+Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->f$1:Z
 Landroid/net/wifi/WifiManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$1;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;)V
-Landroid/net/wifi/WifiManager$1;->lambda$onWifiUsabilityStats$0(Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V
-Landroid/net/wifi/WifiManager$1;->onWifiUsabilityStats(IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V
+Landroid/net/wifi/WifiManager$1;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V
+Landroid/net/wifi/WifiManager$1;->lambda$onResult$0(Ljava/util/function/Consumer;Z)V
+Landroid/net/wifi/WifiManager$1;->onResult(Z)V
 Landroid/net/wifi/WifiManager$1;->this$0:Landroid/net/wifi/WifiManager;
 Landroid/net/wifi/WifiManager$1;->val$executor:Ljava/util/concurrent/Executor;
-Landroid/net/wifi/WifiManager$1;->val$listener:Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;
-Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;Z)V
-Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;
-Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->f$1:Z
+Landroid/net/wifi/WifiManager$1;->val$resultsCallback:Ljava/util/function/Consumer;
+Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V
+Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;
+Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->f$1:I
+Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->f$2:Z
+Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->f$3:Landroid/net/wifi/WifiUsabilityStatsEntry;
 Landroid/net/wifi/WifiManager$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$2;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V
-Landroid/net/wifi/WifiManager$2;->lambda$onStatusChanged$0(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;Z)V
-Landroid/net/wifi/WifiManager$2;->onStatusChanged(Z)V
+Landroid/net/wifi/WifiManager$2;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;)V
+Landroid/net/wifi/WifiManager$2;->lambda$onWifiUsabilityStats$0(Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V
+Landroid/net/wifi/WifiManager$2;->onWifiUsabilityStats(IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V
 Landroid/net/wifi/WifiManager$2;->this$0:Landroid/net/wifi/WifiManager;
 Landroid/net/wifi/WifiManager$2;->val$executor:Ljava/util/concurrent/Executor;
-Landroid/net/wifi/WifiManager$2;->val$listener:Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;
+Landroid/net/wifi/WifiManager$2;->val$listener:Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;
+Landroid/net/wifi/WifiManager$3$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;Z)V
+Landroid/net/wifi/WifiManager$3$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;
+Landroid/net/wifi/WifiManager$3$$ExternalSyntheticLambda0;->f$1:Z
+Landroid/net/wifi/WifiManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$3;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V
+Landroid/net/wifi/WifiManager$3;->lambda$onStatusChanged$0(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;Z)V
+Landroid/net/wifi/WifiManager$3;->onStatusChanged(Z)V
+Landroid/net/wifi/WifiManager$3;->this$0:Landroid/net/wifi/WifiManager;
+Landroid/net/wifi/WifiManager$3;->val$executor:Ljava/util/concurrent/Executor;
+Landroid/net/wifi/WifiManager$3;->val$listener:Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;
+Landroid/net/wifi/WifiManager$4$$ExternalSyntheticLambda0;-><init>(Ljava/util/function/BiConsumer;Ljava/lang/String;Z)V
+Landroid/net/wifi/WifiManager$4$$ExternalSyntheticLambda0;->f$0:Ljava/util/function/BiConsumer;
+Landroid/net/wifi/WifiManager$4$$ExternalSyntheticLambda0;->f$1:Ljava/lang/String;
+Landroid/net/wifi/WifiManager$4$$ExternalSyntheticLambda0;->f$2:Z
+Landroid/net/wifi/WifiManager$4$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$4;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Ljava/util/function/BiConsumer;)V
+Landroid/net/wifi/WifiManager$4;->lambda$onResult$0(Ljava/util/function/BiConsumer;Ljava/lang/String;Z)V
+Landroid/net/wifi/WifiManager$4;->onResult(Ljava/lang/String;Z)V
+Landroid/net/wifi/WifiManager$4;->this$0:Landroid/net/wifi/WifiManager;
+Landroid/net/wifi/WifiManager$4;->val$executor:Ljava/util/concurrent/Executor;
+Landroid/net/wifi/WifiManager$4;->val$resultsCallback:Ljava/util/function/BiConsumer;
+Landroid/net/wifi/WifiManager$5$$ExternalSyntheticLambda0;-><init>(Ljava/util/function/BiConsumer;ZLjava/util/Set;)V
+Landroid/net/wifi/WifiManager$5$$ExternalSyntheticLambda0;->f$0:Ljava/util/function/BiConsumer;
+Landroid/net/wifi/WifiManager$5$$ExternalSyntheticLambda0;->f$1:Z
+Landroid/net/wifi/WifiManager$5$$ExternalSyntheticLambda0;->f$2:Ljava/util/Set;
+Landroid/net/wifi/WifiManager$5$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$5;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Ljava/util/function/BiConsumer;)V
+Landroid/net/wifi/WifiManager$5;->lambda$onResults$0(Ljava/util/function/BiConsumer;ZLjava/util/Set;)V
+Landroid/net/wifi/WifiManager$5;->onResults(Z[I[Ljava/lang/String;)V
+Landroid/net/wifi/WifiManager$5;->this$0:Landroid/net/wifi/WifiManager;
+Landroid/net/wifi/WifiManager$5;->val$executor:Ljava/util/concurrent/Executor;
+Landroid/net/wifi/WifiManager$5;->val$resultCallback:Ljava/util/function/BiConsumer;
+Landroid/net/wifi/WifiManager$ActionListener;->FAILURE_BUSY:I,system-api,test-api
+Landroid/net/wifi/WifiManager$ActionListener;->FAILURE_INTERNAL_ERROR:I,system-api,test-api
+Landroid/net/wifi/WifiManager$ActionListener;->FAILURE_INVALID_ARGS:I,system-api,test-api
+Landroid/net/wifi/WifiManager$ActionListener;->FAILURE_IN_PROGRESS:I,system-api,test-api
+Landroid/net/wifi/WifiManager$ActionListener;->FAILURE_NOT_AUTHORIZED:I,system-api,test-api
 Landroid/net/wifi/WifiManager$ActionListener;->onFailure(I)V,system-api,test-api
 Landroid/net/wifi/WifiManager$ActionListener;->onSuccess()V,system-api,test-api
-Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$ActionListenerProxy;)V
+Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$ActionListenerProxy;I)V
 Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$ActionListenerProxy;
+Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda0;->f$1:I
 Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$ActionListenerProxy;I)V
+Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$ActionListenerProxy;)V
 Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$ActionListenerProxy;
-Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda1;->f$1:I
 Landroid/net/wifi/WifiManager$ActionListenerProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$ActionListenerProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/lang/String;Landroid/os/Looper;Landroid/net/wifi/WifiManager$ActionListener;)V
-Landroid/net/wifi/WifiManager$ActionListenerProxy;->lambda$onFailure$1$WifiManager$ActionListenerProxy(I)V
-Landroid/net/wifi/WifiManager$ActionListenerProxy;->lambda$onSuccess$0$WifiManager$ActionListenerProxy()V
+Landroid/net/wifi/WifiManager$ActionListenerProxy;->lambda$onFailure$1$android-net-wifi-WifiManager$ActionListenerProxy(I)V
+Landroid/net/wifi/WifiManager$ActionListenerProxy;->lambda$onSuccess$0$android-net-wifi-WifiManager$ActionListenerProxy()V
 Landroid/net/wifi/WifiManager$ActionListenerProxy;->mActionTag:Ljava/lang/String;
 Landroid/net/wifi/WifiManager$ActionListenerProxy;->mCallback:Landroid/net/wifi/WifiManager$ActionListener;
 Landroid/net/wifi/WifiManager$ActionListenerProxy;->mHandler:Landroid/os/Handler;
 Landroid/net/wifi/WifiManager$ActionListenerProxy;->onFailure(I)V
 Landroid/net/wifi/WifiManager$ActionListenerProxy;->onSuccess()V
 Landroid/net/wifi/WifiManager$ActionListenerProxy;->this$0:Landroid/net/wifi/WifiManager;
+Landroid/net/wifi/WifiManager$ActiveCountryCodeChangedCallback;->onActiveCountryCodeChanged(Ljava/lang/String;)V,system-api,test-api
+Landroid/net/wifi/WifiManager$ActiveCountryCodeChangedCallback;->onCountryCodeInactive()V,system-api,test-api
 Landroid/net/wifi/WifiManager$AddNetworkResult$1;-><init>()V
 Landroid/net/wifi/WifiManager$AddNetworkResult$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/WifiManager$AddNetworkResult;
 Landroid/net/wifi/WifiManager$AddNetworkResult$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -2929,35 +3515,35 @@
 Landroid/net/wifi/WifiManager$CoexCallback;->getProxy()Landroid/net/wifi/WifiManager$CoexCallback$CoexCallbackProxy;
 Landroid/net/wifi/WifiManager$CoexCallback;->mCoexCallbackProxy:Landroid/net/wifi/WifiManager$CoexCallback$CoexCallbackProxy;
 Landroid/net/wifi/WifiManager$CoexCallback;->onCoexUnsafeChannelsChanged(Ljava/util/List;I)V,system-api,test-api
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;I)V
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;Ljava/lang/String;)V
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda0;->f$1:I
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda0;->f$1:Ljava/lang/String;
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;I)V
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;Ljava/lang/String;ILjava/lang/String;[I)V
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->f$1:I
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->f$1:Ljava/lang/String;
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->f$2:I
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->f$3:Ljava/lang/String;
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->f$4:[I
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;I)V
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda2;->f$1:I
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;Ljava/lang/String;)V
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;I)V
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda3;->f$0:Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda3;->f$1:Ljava/lang/String;
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda3;->f$1:I
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;Ljava/lang/String;ILjava/lang/String;[I)V
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;I)V
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->f$0:Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->f$1:Ljava/lang/String;
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->f$2:I
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->f$3:Ljava/lang/String;
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->f$4:[I
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->f$1:I
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;-><init>(Ljava/util/concurrent/Executor;Landroid/net/wifi/EasyConnectStatusCallback;)V
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onBootstrapUriGenerated$4$WifiManager$EasyConnectCallbackProxy(Ljava/lang/String;)V
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onFailure$2$WifiManager$EasyConnectCallbackProxy(Ljava/lang/String;ILjava/lang/String;[I)V
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onProgress$3$WifiManager$EasyConnectCallbackProxy(I)V
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onSuccess$1$WifiManager$EasyConnectCallbackProxy(I)V
-Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onSuccessConfigReceived$0$WifiManager$EasyConnectCallbackProxy(I)V
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onBootstrapUriGenerated$4$android-net-wifi-WifiManager$EasyConnectCallbackProxy(Ljava/lang/String;)V
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onFailure$2$android-net-wifi-WifiManager$EasyConnectCallbackProxy(Ljava/lang/String;ILjava/lang/String;[I)V
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onProgress$3$android-net-wifi-WifiManager$EasyConnectCallbackProxy(I)V
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onSuccess$1$android-net-wifi-WifiManager$EasyConnectCallbackProxy(I)V
+Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->lambda$onSuccessConfigReceived$0$android-net-wifi-WifiManager$EasyConnectCallbackProxy(I)V
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->mEasyConnectStatusCallback:Landroid/net/wifi/EasyConnectStatusCallback;
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->onBootstrapUriGenerated(Ljava/lang/String;)V
@@ -2965,6 +3551,13 @@
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->onProgress(I)V
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->onSuccess(I)V
 Landroid/net/wifi/WifiManager$EasyConnectCallbackProxy;->onSuccessConfigReceived(I)V
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;-><init>(ILjava/util/Set;)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;->getInterfaceType()I,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;->getPackages()Ljava/util/Set;,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;->mInterfaceType:I
+Landroid/net/wifi/WifiManager$InterfaceCreationImpact;->mPackages:Ljava/util/Set;
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;-><init>()V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;->ERROR_GENERIC:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;->ERROR_INCOMPATIBLE_MODE:I,public-api,system-api,test-api
@@ -2974,21 +3567,21 @@
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;->onFailed(I)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;->onStarted(Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;->onStopped()V,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;)V
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;)V
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda0;->f$1:Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;I)V
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;)V
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda1;->f$1:I
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;)V
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;I)V
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda2;->f$1:I
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;)V
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->lambda$onHotspotFailed$2$WifiManager$LocalOnlyHotspotCallbackProxy(I)V
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->lambda$onHotspotStarted$0$WifiManager$LocalOnlyHotspotCallbackProxy(Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;)V
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->lambda$onHotspotStopped$1$WifiManager$LocalOnlyHotspotCallbackProxy()V
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->lambda$onHotspotFailed$2$android-net-wifi-WifiManager$LocalOnlyHotspotCallbackProxy(I)V
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->lambda$onHotspotStarted$0$android-net-wifi-WifiManager$LocalOnlyHotspotCallbackProxy(Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;)V
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->lambda$onHotspotStopped$1$android-net-wifi-WifiManager$LocalOnlyHotspotCallbackProxy()V
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->mCallback:Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallbackProxy;->mWifiManager:Ljava/lang/ref/WeakReference;
@@ -2999,21 +3592,21 @@
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;->onRegistered(Landroid/net/wifi/WifiManager$LocalOnlyHotspotSubscription;)V
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;->onStarted(Landroid/net/wifi/SoftApConfiguration;)V
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;->onStopped()V
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;)V
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;Landroid/net/wifi/SoftApConfiguration;)V
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda0;->f$1:Landroid/net/wifi/SoftApConfiguration;
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;Landroid/net/wifi/SoftApConfiguration;)V
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;)V
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/SoftApConfiguration;
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;Landroid/net/wifi/WifiManager;)V
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/WifiManager;
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;)V
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->lambda$onHotspotStarted$1$WifiManager$LocalOnlyHotspotObserverProxy(Landroid/net/wifi/SoftApConfiguration;)V
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->lambda$onHotspotStopped$2$WifiManager$LocalOnlyHotspotObserverProxy()V
-Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->lambda$registered$0$WifiManager$LocalOnlyHotspotObserverProxy(Landroid/net/wifi/WifiManager;)V
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->lambda$onHotspotStarted$1$android-net-wifi-WifiManager$LocalOnlyHotspotObserverProxy(Landroid/net/wifi/SoftApConfiguration;)V
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->lambda$onHotspotStopped$2$android-net-wifi-WifiManager$LocalOnlyHotspotObserverProxy()V
+Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->lambda$registered$0$android-net-wifi-WifiManager$LocalOnlyHotspotObserverProxy(Landroid/net/wifi/WifiManager;)V
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->mExecutor:Ljava/util/concurrent/Executor;
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->mObserver:Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserver;
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotObserverProxy;->mWifiManager:Ljava/lang/ref/WeakReference;
@@ -3037,7 +3630,7 @@
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotSubscription;->mCloseGuard:Landroid/util/CloseGuard;
 Landroid/net/wifi/WifiManager$LocalOnlyHotspotSubscription;->this$0:Landroid/net/wifi/WifiManager;
 Landroid/net/wifi/WifiManager$MulticastLock;-><init>(Landroid/net/wifi/WifiManager;Ljava/lang/String;)V
-Landroid/net/wifi/WifiManager$MulticastLock;-><init>(Landroid/net/wifi/WifiManager;Ljava/lang/String;Landroid/net/wifi/WifiManager$1;)V
+Landroid/net/wifi/WifiManager$MulticastLock;-><init>(Landroid/net/wifi/WifiManager;Ljava/lang/String;Landroid/net/wifi/WifiManager$MulticastLock-IA;)V
 Landroid/net/wifi/WifiManager$MulticastLock;->acquire()V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$MulticastLock;->finalize()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$MulticastLock;->isHeld()Z,public-api,system-api,test-api
@@ -3055,31 +3648,31 @@
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;->onUserSelectionCallbackRegistration(Landroid/net/wifi/WifiManager$NetworkRequestUserSelectionCallback;)V,system-api,test-api
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;->onUserSelectionConnectFailure(Landroid/net/wifi/WifiConfiguration;)V,system-api,test-api
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;->onUserSelectionConnectSuccess(Landroid/net/wifi/WifiConfiguration;)V,system-api,test-api
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;)V
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Landroid/net/wifi/WifiConfiguration;)V
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda0;->f$1:Landroid/net/wifi/WifiConfiguration;
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Landroid/net/wifi/INetworkRequestUserSelectionCallback;)V
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Landroid/net/wifi/WifiConfiguration;)V
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/INetworkRequestUserSelectionCallback;
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/WifiConfiguration;
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Landroid/net/wifi/WifiConfiguration;)V
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;)V
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/WifiConfiguration;
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Landroid/net/wifi/WifiConfiguration;)V
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Ljava/util/List;)V
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda3;->f$0:Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda3;->f$1:Landroid/net/wifi/WifiConfiguration;
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda3;->f$1:Ljava/util/List;
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Ljava/util/List;)V
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;Landroid/net/wifi/INetworkRequestUserSelectionCallback;)V
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda4;->f$0:Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda4;->f$1:Ljava/util/List;
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda4;->f$1:Landroid/net/wifi/INetworkRequestUserSelectionCallback;
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;)V
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onAbort$1$WifiManager$NetworkRequestMatchCallbackProxy()V
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onMatch$2$WifiManager$NetworkRequestMatchCallbackProxy(Ljava/util/List;)V
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onUserSelectionCallbackRegistration$0$WifiManager$NetworkRequestMatchCallbackProxy(Landroid/net/wifi/INetworkRequestUserSelectionCallback;)V
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onUserSelectionConnectFailure$4$WifiManager$NetworkRequestMatchCallbackProxy(Landroid/net/wifi/WifiConfiguration;)V
-Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onUserSelectionConnectSuccess$3$WifiManager$NetworkRequestMatchCallbackProxy(Landroid/net/wifi/WifiConfiguration;)V
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onAbort$1$android-net-wifi-WifiManager$NetworkRequestMatchCallbackProxy()V
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onMatch$2$android-net-wifi-WifiManager$NetworkRequestMatchCallbackProxy(Ljava/util/List;)V
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onUserSelectionCallbackRegistration$0$android-net-wifi-WifiManager$NetworkRequestMatchCallbackProxy(Landroid/net/wifi/INetworkRequestUserSelectionCallback;)V
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onUserSelectionConnectFailure$4$android-net-wifi-WifiManager$NetworkRequestMatchCallbackProxy(Landroid/net/wifi/WifiConfiguration;)V
+Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->lambda$onUserSelectionConnectSuccess$3$android-net-wifi-WifiManager$NetworkRequestMatchCallbackProxy(Landroid/net/wifi/WifiConfiguration;)V
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->mCallback:Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;
 Landroid/net/wifi/WifiManager$NetworkRequestMatchCallbackProxy;->onAbort()V
@@ -3095,6 +3688,19 @@
 Landroid/net/wifi/WifiManager$NetworkRequestUserSelectionCallbackProxy;->reject()V,system-api,test-api
 Landroid/net/wifi/WifiManager$NetworkRequestUserSelectionCallbackProxy;->select(Landroid/net/wifi/WifiConfiguration;)V,system-api,test-api
 Landroid/net/wifi/WifiManager$NetworkRequestUserSelectionCallbackProxy;->this$0:Landroid/net/wifi/WifiManager;
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;Ljava/lang/String;)V
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda0;->f$1:Ljava/lang/String;
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;)V
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;-><init>(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$ActiveCountryCodeChangedCallback;)V
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;->lambda$onDriverCountryCodeChanged$0$android-net-wifi-WifiManager$OnDriverCountryCodeChangedProxy(Ljava/lang/String;)V
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;->lambda$onDriverCountryCodeChanged$1$android-net-wifi-WifiManager$OnDriverCountryCodeChangedProxy()V
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;->mCallback:Landroid/net/wifi/WifiManager$ActiveCountryCodeChangedCallback;
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;->mExecutor:Ljava/util/concurrent/Executor;
+Landroid/net/wifi/WifiManager$OnDriverCountryCodeChangedProxy;->onDriverCountryCodeChanged(Ljava/lang/String;)V
 Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoListener;->onWifiActivityEnergyInfo(Landroid/os/connectivity/WifiActivityEnergyInfo;)V,system-api,test-api
 Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoListener;Landroid/os/connectivity/WifiActivityEnergyInfo;)V
 Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoListener;
@@ -3107,21 +3713,59 @@
 Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoProxy;->mLock:Ljava/lang/Object;
 Landroid/net/wifi/WifiManager$OnWifiActivityEnergyInfoProxy;->onWifiActivityEnergyInfo(Landroid/os/connectivity/WifiActivityEnergyInfo;)V
 Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;->onWifiUsabilityStats(IZLandroid/net/wifi/WifiUsabilityStatsEntry;)V,system-api,test-api
-Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;)V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REGISTER_PNO_CALLBACK_ALREADY_REGISTERED:I,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REGISTER_PNO_CALLBACK_PNO_NOT_SUPPORTED:I,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REGISTER_PNO_CALLBACK_RESOURCE_BUSY:I,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REGISTER_PNO_CALLBACK_UNKNOWN:I,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REMOVE_PNO_CALLBACK_RESULTS_DELIVERED:I,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REMOVE_PNO_CALLBACK_UNKNOWN:I,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->REMOVE_PNO_CALLBACK_UNREGISTERED:I,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->onRegisterFailed(I)V,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->onRegisterSuccess()V,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->onRemoved(I)V,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallback;->onScanResultsAvailable(Ljava/util/List;)V,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;I)V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda0;->f$1:I
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;I)V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda1;->f$1:I
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;)V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;Ljava/util/List;)V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda3;->f$0:Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda3;->f$1:Ljava/util/List;
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$PnoScanResultsCallback;)V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->lambda$onRegisterFailed$2$android-net-wifi-WifiManager$PnoScanResultsCallbackProxy(I)V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->lambda$onRegisterSuccess$1$android-net-wifi-WifiManager$PnoScanResultsCallbackProxy()V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->lambda$onRemoved$3$android-net-wifi-WifiManager$PnoScanResultsCallbackProxy(I)V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->lambda$onScanResultsAvailable$0$android-net-wifi-WifiManager$PnoScanResultsCallbackProxy(Ljava/util/List;)V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->mCallback:Landroid/net/wifi/WifiManager$PnoScanResultsCallback;
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->onRegisterFailed(I)V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->onRegisterSuccess()V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->onRemoved(I)V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->onScanResultsAvailable(Ljava/util/List;)V
+Landroid/net/wifi/WifiManager$PnoScanResultsCallbackProxy;->this$0:Landroid/net/wifi/WifiManager;
+Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;I)V
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;
+Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda0;->f$1:I
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;I)V
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda1;->f$1:I
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;I)V
+Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;)V
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;
-Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda2;->f$1:I
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;-><init>(Ljava/util/concurrent/Executor;Landroid/net/wifi/hotspot2/ProvisioningCallback;)V
-Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->lambda$onProvisioningComplete$2$WifiManager$ProvisioningCallbackProxy()V
-Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->lambda$onProvisioningFailure$1$WifiManager$ProvisioningCallbackProxy(I)V
-Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->lambda$onProvisioningStatus$0$WifiManager$ProvisioningCallbackProxy(I)V
+Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->lambda$onProvisioningComplete$2$android-net-wifi-WifiManager$ProvisioningCallbackProxy()V
+Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->lambda$onProvisioningFailure$1$android-net-wifi-WifiManager$ProvisioningCallbackProxy(I)V
+Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->lambda$onProvisioningStatus$0$android-net-wifi-WifiManager$ProvisioningCallbackProxy(I)V
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->mCallback:Landroid/net/wifi/hotspot2/ProvisioningCallback;
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;
 Landroid/net/wifi/WifiManager$ProvisioningCallbackProxy;->onProvisioningComplete()V
@@ -3147,7 +3791,7 @@
 Landroid/net/wifi/WifiManager$ScoreUpdateObserver;->requestNudOperation(I)V,system-api,test-api
 Landroid/net/wifi/WifiManager$ScoreUpdateObserver;->triggerUpdateOfWifiUsabilityStats(I)V,system-api,test-api
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;-><init>(Landroid/net/wifi/WifiManager;Landroid/net/wifi/IScoreUpdateObserver;)V
-Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;-><init>(Landroid/net/wifi/WifiManager;Landroid/net/wifi/IScoreUpdateObserver;Landroid/net/wifi/WifiManager$1;)V
+Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;-><init>(Landroid/net/wifi/WifiManager;Landroid/net/wifi/IScoreUpdateObserver;Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy-IA;)V
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;->blocklistCurrentBssid(I)V,system-api,test-api
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;->mScoreUpdateObserver:Landroid/net/wifi/IScoreUpdateObserver;
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;->notifyScoreUpdate(II)V,system-api,test-api
@@ -3155,6 +3799,11 @@
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;->requestNudOperation(I)V,system-api,test-api
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;->this$0:Landroid/net/wifi/WifiManager;
 Landroid/net/wifi/WifiManager$ScoreUpdateObserverProxy;->triggerUpdateOfWifiUsabilityStats(I)V,system-api,test-api
+Landroid/net/wifi/WifiManager$ScreenOnScanSchedule;-><init>(Ljava/time/Duration;I)V,system-api,test-api
+Landroid/net/wifi/WifiManager$ScreenOnScanSchedule;->getScanInterval()Ljava/time/Duration;,system-api,test-api
+Landroid/net/wifi/WifiManager$ScreenOnScanSchedule;->getScanType()I,system-api,test-api
+Landroid/net/wifi/WifiManager$ScreenOnScanSchedule;->mScanInterval:Ljava/time/Duration;
+Landroid/net/wifi/WifiManager$ScreenOnScanSchedule;->mScanType:I
 Landroid/net/wifi/WifiManager$SoftApCallback;->onBlockedClientConnecting(Landroid/net/wifi/WifiClient;I)V,system-api,test-api
 Landroid/net/wifi/WifiManager$SoftApCallback;->onCapabilityChanged(Landroid/net/wifi/SoftApCapability;)V,system-api,test-api
 Landroid/net/wifi/WifiManager$SoftApCallback;->onConnectedClientsChanged(Landroid/net/wifi/SoftApInfo;Ljava/util/List;)V,system-api,test-api
@@ -3162,50 +3811,51 @@
 Landroid/net/wifi/WifiManager$SoftApCallback;->onInfoChanged(Landroid/net/wifi/SoftApInfo;)V,system-api,test-api
 Landroid/net/wifi/WifiManager$SoftApCallback;->onInfoChanged(Ljava/util/List;)V,system-api,test-api
 Landroid/net/wifi/WifiManager$SoftApCallback;->onStateChanged(II)V,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;II)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/SoftApCapability;)V
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;->f$1:I
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;->f$2:I
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;->f$1:Landroid/net/wifi/SoftApCapability;
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/SoftApCapability;)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/SoftApInfo;Ljava/util/Map;)V
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/SoftApCapability;
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/SoftApInfo;
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;->f$2:Ljava/util/Map;
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/SoftApInfo;)V
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/SoftApInfo;
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/SoftApInfo;Ljava/util/Map;)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Ljava/util/List;)V
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;->f$1:Landroid/net/wifi/SoftApInfo;
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;->f$2:Ljava/util/Map;
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;->f$1:Ljava/util/List;
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/WifiClient;I)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Ljava/util/Map;)V
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;->f$1:Landroid/net/wifi/WifiClient;
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;->f$2:I
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;->f$1:Ljava/util/Map;
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Ljava/util/List;)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Landroid/net/wifi/WifiClient;I)V
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;->f$1:Ljava/util/List;
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;->f$1:Landroid/net/wifi/WifiClient;
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;->f$2:I
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;Ljava/util/Map;)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;-><init>(Landroid/net/wifi/WifiManager$SoftApCallbackProxy;II)V
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;->f$0:Landroid/net/wifi/WifiManager$SoftApCallbackProxy;
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;->f$1:Ljava/util/Map;
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;->f$1:I
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;->f$2:I
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SoftApCallback;)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SoftApCallback;I)V
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->getConnectedClientList(Ljava/util/Map;)Ljava/util/List;
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onBlockedClientConnecting$6$WifiManager$SoftApCallbackProxy(Landroid/net/wifi/WifiClient;I)V
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onCapabilityChanged$5$WifiManager$SoftApCallbackProxy(Landroid/net/wifi/SoftApCapability;)V
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$1$WifiManager$SoftApCallbackProxy(Landroid/net/wifi/SoftApInfo;Ljava/util/Map;)V
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$2$WifiManager$SoftApCallbackProxy(Landroid/net/wifi/SoftApInfo;)V
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$3$WifiManager$SoftApCallbackProxy(Ljava/util/List;)V
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$4$WifiManager$SoftApCallbackProxy(Ljava/util/Map;)V
-Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onStateChanged$0$WifiManager$SoftApCallbackProxy(II)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onBlockedClientConnecting$6$android-net-wifi-WifiManager$SoftApCallbackProxy(Landroid/net/wifi/WifiClient;I)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onCapabilityChanged$5$android-net-wifi-WifiManager$SoftApCallbackProxy(Landroid/net/wifi/SoftApCapability;)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$1$android-net-wifi-WifiManager$SoftApCallbackProxy(Landroid/net/wifi/SoftApInfo;Ljava/util/Map;)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$2$android-net-wifi-WifiManager$SoftApCallbackProxy(Landroid/net/wifi/SoftApInfo;)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$3$android-net-wifi-WifiManager$SoftApCallbackProxy(Ljava/util/List;)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onConnectedClientsOrInfoChanged$4$android-net-wifi-WifiManager$SoftApCallbackProxy(Ljava/util/Map;)V
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->lambda$onStateChanged$0$android-net-wifi-WifiManager$SoftApCallbackProxy(II)V
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->mCallback:Landroid/net/wifi/WifiManager$SoftApCallback;
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->mCurrentClients:Ljava/util/Map;
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->mCurrentInfos:Ljava/util/Map;
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;
+Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->mIpMode:I
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->onBlockedClientConnecting(Landroid/net/wifi/WifiClient;I)V
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->onCapabilityChanged(Landroid/net/wifi/SoftApCapability;)V
 Landroid/net/wifi/WifiManager$SoftApCallbackProxy;->onConnectedClientsOrInfoChanged(Ljava/util/Map;Ljava/util/Map;ZZ)V
@@ -3237,7 +3887,7 @@
 Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy$$ExternalSyntheticLambda0;->f$2:I
 Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListener;)V
-Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy;->lambda$onConnectionStatus$0$WifiManager$SuggestionConnectionStatusListenerProxy(Landroid/net/wifi/WifiNetworkSuggestion;I)V
+Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy;->lambda$onConnectionStatus$0$android-net-wifi-WifiManager$SuggestionConnectionStatusListenerProxy(Landroid/net/wifi/WifiNetworkSuggestion;I)V
 Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy;->mExecutor:Ljava/util/concurrent/Executor;
 Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy;->mListener:Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListener;
 Landroid/net/wifi/WifiManager$SuggestionConnectionStatusListenerProxy;->onConnectionStatus(Landroid/net/wifi/WifiNetworkSuggestion;I)V
@@ -3248,7 +3898,7 @@
 Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy$$ExternalSyntheticLambda0;->f$1:I
 Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListener;)V
-Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy;->lambda$onUserApprovalStatusChange$0$WifiManager$SuggestionUserApprovalStatusListenerProxy(I)V
+Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy;->lambda$onUserApprovalStatusChange$0$android-net-wifi-WifiManager$SuggestionUserApprovalStatusListenerProxy(I)V
 Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy;->mExecutor:Ljava/util/concurrent/Executor;
 Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy;->mListener:Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListener;
 Landroid/net/wifi/WifiManager$SuggestionUserApprovalStatusListenerProxy;->onUserApprovalStatusChange(I)V
@@ -3263,7 +3913,7 @@
 Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy$$ExternalSyntheticLambda0;->f$1:I
 Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$TrafficStateCallback;)V
-Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy;->lambda$onStateChanged$0$WifiManager$TrafficStateCallbackProxy(I)V
+Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy;->lambda$onStateChanged$0$android-net-wifi-WifiManager$TrafficStateCallbackProxy(I)V
 Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy;->mCallback:Landroid/net/wifi/WifiManager$TrafficStateCallback;
 Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy;->mExecutor:Ljava/util/concurrent/Executor;
 Landroid/net/wifi/WifiManager$TrafficStateCallbackProxy;->onStateChanged(I)V
@@ -3272,22 +3922,22 @@
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorer;->onStart(I)V,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorer;->onStart(Landroid/net/wifi/WifiConnectedSessionInfo;)V,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorer;->onStop(I)V,system-api,test-api
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;I)V
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;Landroid/net/wifi/WifiConnectedSessionInfo;)V
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda0;->f$1:I
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda0;->f$1:Landroid/net/wifi/WifiConnectedSessionInfo;
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;Landroid/net/wifi/IScoreUpdateObserver;)V
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;I)V
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/IScoreUpdateObserver;
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda1;->f$1:I
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;Landroid/net/wifi/WifiConnectedSessionInfo;)V
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;Landroid/net/wifi/IScoreUpdateObserver;)V
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/WifiConnectedSessionInfo;
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/IScoreUpdateObserver;
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;-><init>(Landroid/net/wifi/WifiManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorer;)V
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->lambda$onSetScoreUpdateObserver$2$WifiManager$WifiConnectedNetworkScorerProxy(Landroid/net/wifi/IScoreUpdateObserver;)V
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->lambda$onStart$0$WifiManager$WifiConnectedNetworkScorerProxy(Landroid/net/wifi/WifiConnectedSessionInfo;)V
-Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->lambda$onStop$1$WifiManager$WifiConnectedNetworkScorerProxy(I)V
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->lambda$onSetScoreUpdateObserver$2$android-net-wifi-WifiManager$WifiConnectedNetworkScorerProxy(Landroid/net/wifi/IScoreUpdateObserver;)V
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->lambda$onStart$0$android-net-wifi-WifiManager$WifiConnectedNetworkScorerProxy(Landroid/net/wifi/WifiConnectedSessionInfo;)V
+Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->lambda$onStop$1$android-net-wifi-WifiManager$WifiConnectedNetworkScorerProxy(I)V
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->mExecutor:Ljava/util/concurrent/Executor;
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->mScorer:Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorer;
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->onSetScoreUpdateObserver(Landroid/net/wifi/IScoreUpdateObserver;)V
@@ -3295,7 +3945,7 @@
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->onStop(I)V
 Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorerProxy;->this$0:Landroid/net/wifi/WifiManager;
 Landroid/net/wifi/WifiManager$WifiLock;-><init>(Landroid/net/wifi/WifiManager;ILjava/lang/String;)V
-Landroid/net/wifi/WifiManager$WifiLock;-><init>(Landroid/net/wifi/WifiManager;ILjava/lang/String;Landroid/net/wifi/WifiManager$1;)V
+Landroid/net/wifi/WifiManager$WifiLock;-><init>(Landroid/net/wifi/WifiManager;ILjava/lang/String;Landroid/net/wifi/WifiManager$WifiLock-IA;)V
 Landroid/net/wifi/WifiManager$WifiLock;->acquire()V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiLock;->finalize()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$WifiLock;->isHeld()Z,public-api,system-api,test-api
@@ -3316,8 +3966,15 @@
 Landroid/net/wifi/WifiManager$WpsCallback;->onFailed(I)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$WpsCallback;->onStarted(Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager$WpsCallback;->onSucceeded()V,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->-$$Nest$fgetmActiveLockCount(Landroid/net/wifi/WifiManager;)I
+Landroid/net/wifi/WifiManager;->-$$Nest$fgetmLock(Landroid/net/wifi/WifiManager;)Ljava/lang/Object;
+Landroid/net/wifi/WifiManager;->-$$Nest$fgetmVerboseLoggingEnabled(Landroid/net/wifi/WifiManager;)Z
+Landroid/net/wifi/WifiManager;->-$$Nest$fputmActiveLockCount(Landroid/net/wifi/WifiManager;I)V
+Landroid/net/wifi/WifiManager;->-$$Nest$mstopLocalOnlyHotspot(Landroid/net/wifi/WifiManager;)V
 Landroid/net/wifi/WifiManager;-><clinit>()V
 Landroid/net/wifi/WifiManager;-><init>(Landroid/content/Context;Landroid/net/wifi/IWifiManager;Landroid/os/Looper;)V
+Landroid/net/wifi/WifiManager;->ACTION_DISMISS_DIALOG:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->ACTION_LAUNCH_DIALOG:Ljava/lang/String;
 Landroid/net/wifi/WifiManager;->ACTION_LINK_CONFIGURATION_CHANGED:Ljava/lang/String;,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_NETWORK_SETTINGS_RESET:Ljava/lang/String;,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_PASSPOINT_DEAUTH_IMMINENT:Ljava/lang/String;
@@ -3327,14 +3984,23 @@
 Landroid/net/wifi/WifiManager;->ACTION_PASSPOINT_SUBSCRIPTION_REMEDIATION:Ljava/lang/String;
 Landroid/net/wifi/WifiManager;->ACTION_PICK_WIFI_NETWORK:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_REFRESH_USER_PROVISIONING:Ljava/lang/String;,system-api,test-api
+Landroid/net/wifi/WifiManager;->ACTION_REMOVE_SUGGESTION_DISCONNECT:I,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->ACTION_REMOVE_SUGGESTION_LINGER:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_REQUEST_DISABLE:Ljava/lang/String;,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_REQUEST_ENABLE:Ljava/lang/String;,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_WIFI_NETWORK_SUGGESTION_POST_CONNECTION:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->ACTION_WIFI_SCAN_AVAILABILITY_CHANGED:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->ALL_ZEROS_MAC_ADDRESS:Landroid/net/MacAddress;
+Landroid/net/wifi/WifiManager;->API_AUTOJOIN_GLOBAL:I,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_MAX:I
+Landroid/net/wifi/WifiManager;->API_SCANNING_ENABLED:I,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_SET_ONE_SHOT_SCREEN_ON_CONNECTIVITY_SCAN_DELAY:I
+Landroid/net/wifi/WifiManager;->API_SET_SCAN_SCHEDULE:I,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_SOFT_AP:I,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_TETHERED_HOTSPOT:I,system-api,test-api
+Landroid/net/wifi/WifiManager;->API_WIFI_ENABLED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->BATCHED_SCAN_RESULTS_AVAILABLE_ACTION:Ljava/lang/String;
-Landroid/net/wifi/WifiManager;->BUSY:I
 Landroid/net/wifi/WifiManager;->CHANGE_REASON_ADDED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->CHANGE_REASON_CONFIG_CHANGE:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->CHANGE_REASON_REMOVED:I,system-api,test-api
@@ -3347,6 +4013,14 @@
 Landroid/net/wifi/WifiManager;->DEVICE_MOBILITY_STATE_LOW_MVMT:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->DEVICE_MOBILITY_STATE_STATIONARY:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->DEVICE_MOBILITY_STATE_UNKNOWN:I,system-api,test-api
+Landroid/net/wifi/WifiManager;->DIALOG_REPLY_CANCELLED:I
+Landroid/net/wifi/WifiManager;->DIALOG_REPLY_NEGATIVE:I
+Landroid/net/wifi/WifiManager;->DIALOG_REPLY_NEUTRAL:I
+Landroid/net/wifi/WifiManager;->DIALOG_REPLY_POSITIVE:I
+Landroid/net/wifi/WifiManager;->DIALOG_TYPE_P2P_INVITATION_RECEIVED:I
+Landroid/net/wifi/WifiManager;->DIALOG_TYPE_P2P_INVITATION_SENT:I
+Landroid/net/wifi/WifiManager;->DIALOG_TYPE_SIMPLE:I
+Landroid/net/wifi/WifiManager;->DIALOG_TYPE_UNKNOWN:I
 Landroid/net/wifi/WifiManager;->EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP256R1:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP384R1:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->EASY_CONNECT_CRYPTOGRAPHY_CURVE_BRAINPOOLP512R1:I,system-api,test-api
@@ -3356,7 +4030,6 @@
 Landroid/net/wifi/WifiManager;->EASY_CONNECT_DEVICE_INFO_MAXIMUM_LENGTH:I
 Landroid/net/wifi/WifiManager;->EASY_CONNECT_NETWORK_ROLE_AP:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->EASY_CONNECT_NETWORK_ROLE_STA:I,system-api,test-api
-Landroid/net/wifi/WifiManager;->ERROR:I
 Landroid/net/wifi/WifiManager;->ERROR_AUTHENTICATING:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->ERROR_AUTH_FAILURE_EAP_FAILURE:I
 Landroid/net/wifi/WifiManager;->ERROR_AUTH_FAILURE_NONE:I
@@ -3367,6 +4040,16 @@
 Landroid/net/wifi/WifiManager;->EXTRA_BSSID_LONG:Ljava/lang/String;
 Landroid/net/wifi/WifiManager;->EXTRA_CHANGE_REASON:Ljava/lang/String;,system-api,test-api
 Landroid/net/wifi/WifiManager;->EXTRA_DELAY:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_ID:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_MESSAGE:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_MESSAGE_URL:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_MESSAGE_URL_END:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_MESSAGE_URL_START:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_NEGATIVE_BUTTON_TEXT:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_NEUTRAL_BUTTON_TEXT:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_POSITIVE_BUTTON_TEXT:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_TITLE:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->EXTRA_DIALOG_TYPE:Ljava/lang/String;
 Landroid/net/wifi/WifiManager;->EXTRA_ESS:Ljava/lang/String;
 Landroid/net/wifi/WifiManager;->EXTRA_FILENAME:Ljava/lang/String;
 Landroid/net/wifi/WifiManager;->EXTRA_ICON:Ljava/lang/String;
@@ -3378,6 +4061,10 @@
 Landroid/net/wifi/WifiManager;->EXTRA_NEW_RSSI:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->EXTRA_NEW_STATE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->EXTRA_OSU_NETWORK:Ljava/lang/String;,system-api,test-api
+Landroid/net/wifi/WifiManager;->EXTRA_P2P_DEVICE_NAME:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->EXTRA_P2P_DISPLAY_PIN:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->EXTRA_P2P_PIN_REQUESTED:Ljava/lang/String;
+Landroid/net/wifi/WifiManager;->EXTRA_PARAM_KEY_ATTRIBUTION_SOURCE:Ljava/lang/String;
 Landroid/net/wifi/WifiManager;->EXTRA_PREVIOUS_WIFI_AP_STATE:Ljava/lang/String;,system-api,test-api
 Landroid/net/wifi/WifiManager;->EXTRA_PREVIOUS_WIFI_STATE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->EXTRA_RESULTS_UPDATED:Ljava/lang/String;,public-api,system-api,test-api
@@ -3400,8 +4087,7 @@
 Landroid/net/wifi/WifiManager;->IFACE_IP_MODE_LOCAL_ONLY:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->IFACE_IP_MODE_TETHERED:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->IFACE_IP_MODE_UNSPECIFIED:I,system-api,test-api
-Landroid/net/wifi/WifiManager;->INVALID_ARGS:I
-Landroid/net/wifi/WifiManager;->IN_PROGRESS:I
+Landroid/net/wifi/WifiManager;->INVALID_DIALOG_ID:I
 Landroid/net/wifi/WifiManager;->LINK_CONFIGURATION_CHANGED_ACTION:Ljava/lang/String;
 Landroid/net/wifi/WifiManager;->MAX_ACTIVE_LOCKS:I
 Landroid/net/wifi/WifiManager;->MAX_RSSI:I
@@ -3410,7 +4096,6 @@
 Landroid/net/wifi/WifiManager;->NETWORK_STATE_CHANGED_ACTION:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->NETWORK_SUGGESTIONS_MAX_PER_APP_HIGH_RAM:I
 Landroid/net/wifi/WifiManager;->NETWORK_SUGGESTIONS_MAX_PER_APP_LOW_RAM:I
-Landroid/net/wifi/WifiManager;->NOT_AUTHORIZED:I
 Landroid/net/wifi/WifiManager;->PASSPOINT_HOME_NETWORK:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->PASSPOINT_ROAMING_NETWORK:I,system-api,test-api
 Landroid/net/wifi/WifiManager;->RSSI_CHANGED_ACTION:Ljava/lang/String;,public-api,system-api,test-api
@@ -3429,6 +4114,7 @@
 Landroid/net/wifi/WifiManager;->STATUS_NETWORK_SUGGESTIONS_ERROR_APP_DISALLOWED:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->STATUS_NETWORK_SUGGESTIONS_ERROR_INTERNAL:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->STATUS_NETWORK_SUGGESTIONS_ERROR_REMOVE_INVALID:I,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->STATUS_NETWORK_SUGGESTIONS_ERROR_RESTRICTED_BY_ADMIN:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->STATUS_NETWORK_SUGGESTIONS_SUCCESS:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->STATUS_SUGGESTION_APPROVAL_APPROVED_BY_CARRIER_PRIVILEGE:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->STATUS_SUGGESTION_APPROVAL_APPROVED_BY_USER:I,public-api,system-api,test-api
@@ -3458,6 +4144,7 @@
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_ADDITIONAL_STA:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_ADDITIONAL_STA_LOCAL_ONLY:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_ADDITIONAL_STA_MBB:J
+Landroid/net/wifi/WifiManager;->WIFI_FEATURE_ADDITIONAL_STA_MULTI_INTERNET:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_ADDITIONAL_STA_RESTRICTED:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_AP_RAND_MAC:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_AP_STA:J
@@ -3471,6 +4158,7 @@
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_D2D_RTT:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_DECORATED_IDENTITY:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_DPP:J
+Landroid/net/wifi/WifiManager;->WIFI_FEATURE_DPP_AKM:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_DPP_ENROLLEE_RESPONDER:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_EPR:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_FILS_SHA256:J
@@ -3501,6 +4189,7 @@
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TDLS:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TDLS_OFFCHANNEL:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TRANSMIT_POWER:J
+Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TRUST_ON_FIRST_USE:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_TX_POWER_LIMIT:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_WAPI:J
 Landroid/net/wifi/WifiManager;->WIFI_FEATURE_WFD_R2:J
@@ -3509,11 +4198,18 @@
 Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_2GHZ:I
 Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_5GHZ:I
 Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_AUTO:I
+Landroid/net/wifi/WifiManager;->WIFI_INTERFACE_TYPE_AP:I,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->WIFI_INTERFACE_TYPE_AWARE:I,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->WIFI_INTERFACE_TYPE_DIRECT:I,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->WIFI_INTERFACE_TYPE_STA:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_MODE_FULL:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_MODE_FULL_HIGH_PERF:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_MODE_FULL_LOW_LATENCY:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_MODE_NO_LOCKS_HELD:I
 Landroid/net/wifi/WifiManager;->WIFI_MODE_SCAN_ONLY:I,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->WIFI_MULTI_INTERNET_MODE_DBS_AP:I,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->WIFI_MULTI_INTERNET_MODE_DISABLED:I,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->WIFI_MULTI_INTERNET_MODE_MULTI_AP:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_STATE_CHANGED_ACTION:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_STATE_DISABLED:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->WIFI_STATE_DISABLING:I,public-api,system-api,test-api
@@ -3525,12 +4221,7 @@
 Landroid/net/wifi/WifiManager;->WPS_TIMED_OUT:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->WPS_TKIP_ONLY_PROHIBITED:I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->WPS_WEP_PROHIBITED:I,public-api,system-api,test-api
-Landroid/net/wifi/WifiManager;->access$000(Landroid/net/wifi/WifiManager;)Z
-Landroid/net/wifi/WifiManager;->access$100(Landroid/net/wifi/WifiManager;)Ljava/lang/Object;
-Landroid/net/wifi/WifiManager;->access$200(Landroid/net/wifi/WifiManager;)V
-Landroid/net/wifi/WifiManager;->access$300(Landroid/net/wifi/WifiManager;)I
-Landroid/net/wifi/WifiManager;->access$308(Landroid/net/wifi/WifiManager;)I
-Landroid/net/wifi/WifiManager;->access$310(Landroid/net/wifi/WifiManager;)I
+Landroid/net/wifi/WifiManager;->addCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[BLjava/util/List;)V
 Landroid/net/wifi/WifiManager;->addNetwork(Landroid/net/wifi/WifiConfiguration;)I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->addNetworkPrivileged(Landroid/net/wifi/WifiConfiguration;)Landroid/net/wifi/WifiManager$AddNetworkResult;,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->addNetworkSuggestions(Ljava/util/List;)I,public-api,system-api,test-api
@@ -3541,12 +4232,13 @@
 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;->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
-Landroid/net/wifi/WifiManager;->allowAutojoinGlobal(Z)V,system-api,test-api
+Landroid/net/wifi/WifiManager;->allowAutojoinGlobal(Z)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->allowAutojoinPasspoint(Ljava/lang/String;Z)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->calculateSignalLevel(I)I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->calculateSignalLevel(II)I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V
 Landroid/net/wifi/WifiManager;->cancelWps(Landroid/net/wifi/WifiManager$WpsCallback;)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->clearExternalPnoScanRequest()V,system-api,test-api
 Landroid/net/wifi/WifiManager;->clearOverrideCountryCode()V,system-api,test-api
 Landroid/net/wifi/WifiManager;->clearWifiConnectedNetworkScorer()V,system-api,test-api
 Landroid/net/wifi/WifiManager;->compareSignalLevel(II)I,public-api,system-api,test-api
@@ -3577,6 +4269,7 @@
 Landroid/net/wifi/WifiManager;->getEasyConnectMaxAllowedResponderDeviceInfoLength()I,system-api,test-api
 Landroid/net/wifi/WifiManager;->getEnableAutoJoinWhenAssociated()Z
 Landroid/net/wifi/WifiManager;->getFactoryMacAddresses()[Ljava/lang/String;,system-api,test-api
+Landroid/net/wifi/WifiManager;->getLastCallerInfoForApi(ILjava/util/concurrent/Executor;Ljava/util/function/BiConsumer;)V,system-api,test-api
 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
@@ -3584,10 +4277,14 @@
 Landroid/net/wifi/WifiManager;->getMaxNumberOfNetworkSuggestionsPerApp(Z)I
 Landroid/net/wifi/WifiManager;->getMaxSignalLevel()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->getNetworkSuggestions()Ljava/util/List;,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->getOemPrivilegedWifiAdminPackages()Ljava/util/Set;,system-api,test-api
 Landroid/net/wifi/WifiManager;->getPasspointConfigurations()Ljava/util/List;,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->getPrivilegedConfiguredNetworks()Ljava/util/List;,system-api,test-api
+Landroid/net/wifi/WifiManager;->getPrivilegedConnectedNetwork()Landroid/net/wifi/WifiConfiguration;,system-api,test-api
 Landroid/net/wifi/WifiManager;->getScanResults()Ljava/util/List;,public-api,system-api,test-api
 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;->getSupportedFeatures()J
 Landroid/net/wifi/WifiManager;->getUsableChannels(II)Ljava/util/List;,system-api,test-api
 Landroid/net/wifi/WifiManager;->getVerboseLoggingLevel()I,system-api,test-api
@@ -3610,6 +4307,7 @@
 Landroid/net/wifi/WifiManager;->isDefaultCoexAlgorithmEnabled()Z
 Landroid/net/wifi/WifiManager;->isDeviceToApRttSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isDeviceToDeviceRttSupported()Z,system-api,test-api
+Landroid/net/wifi/WifiManager;->isEasyConnectDppAkmSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isEasyConnectEnrolleeResponderModeSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isEasyConnectSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isEnhancedOpenSupported()Z,public-api,system-api,test-api
@@ -3628,14 +4326,17 @@
 Landroid/net/wifi/WifiManager;->isStaApConcurrencySupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isStaBridgedApConcurrencySupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isStaConcurrencyForLocalOnlyConnectionsSupported()Z,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->isStaConcurrencyForMultiInternetSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isStaConcurrencyForRestrictedConnectionsSupported()Z,system-api,test-api
 Landroid/net/wifi/WifiManager;->isTdlsSupported()Z,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->isTrustOnFirstUseSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isVerboseLoggingEnabled()Z,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWapiSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWifiApEnabled()Z,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWifiAwareSupported()Z
 Landroid/net/wifi/WifiManager;->isWifiDisplayR2Supported()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWifiEnabled()Z,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->isWifiPasspointEnabled()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWifiScannerSupported()Z,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWifiStandardSupported(I)Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->isWpa3SaeH2eSupported()Z,public-api,system-api,test-api
@@ -3652,32 +4353,44 @@
 Landroid/net/wifi/WifiManager;->mTargetSdkVersion:I
 Landroid/net/wifi/WifiManager;->mVerboseLoggingEnabled:Z
 Landroid/net/wifi/WifiManager;->matchProviderWithCurrentNetwork(Ljava/lang/String;)I
+Landroid/net/wifi/WifiManager;->notifyMinimumRequiredWifiSecurityLevelChanged(I)V,system-api,test-api
+Landroid/net/wifi/WifiManager;->notifyWifiSsidPolicyChanged(Landroid/app/admin/WifiSsidPolicy;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->parseDppChannelList(Ljava/lang/String;)Landroid/util/SparseArray;
 Landroid/net/wifi/WifiManager;->pingSupplicant()Z,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->queryAutojoinGlobal(Ljava/util/concurrent/Executor;Ljava/util/function/Consumer;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->queryPasspointIcon(JLjava/lang/String;)V
 Landroid/net/wifi/WifiManager;->reassociate()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->reconnect()Z,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->registerActiveCountryCodeChangedCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$ActiveCountryCodeChangedCallback;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->registerCoexCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$CoexCallback;)V,system-api,test-api
+Landroid/net/wifi/WifiManager;->registerLocalOnlyHotspotSoftApCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SoftApCallback;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->registerNetworkRequestMatchCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->registerScanResultsCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$ScanResultsCallback;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->registerSoftApCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SoftApCallback;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->registerSubsystemRestartTrackingCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$SubsystemRestartTrackingCallback;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->registerTrafficStateCallback(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$TrafficStateCallback;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeAppState(ILjava/lang/String;)V,system-api,test-api
+Landroid/net/wifi/WifiManager;->removeCustomDhcpOptions(Landroid/net/wifi/WifiSsid;[B)V
 Landroid/net/wifi/WifiManager;->removeNetwork(I)Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeNetworkSuggestions(Ljava/util/List;)I,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->removeNetworkSuggestions(Ljava/util/List;I)I,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeNonCallerConfiguredNetworks()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->removeOnWifiUsabilityStatsListener(Landroid/net/wifi/WifiManager$OnWifiUsabilityStatsListener;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->removePasspointConfiguration(Ljava/lang/String;)V,public-api,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;->removeWifiVerboseLoggingStatusChangedListener(Landroid/net/wifi/WifiManager$WifiVerboseLoggingStatusChangedListener;)V,system-api,test-api
+Landroid/net/wifi/WifiManager;->replyToP2pInvitationReceivedDialog(IZLjava/lang/String;)V
+Landroid/net/wifi/WifiManager;->replyToSimpleDialog(II)V
+Landroid/net/wifi/WifiManager;->reportCreateInterfaceImpact(IZLjava/util/concurrent/Executor;Ljava/util/function/BiConsumer;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->restartWifiSubsystem()V,system-api,test-api
 Landroid/net/wifi/WifiManager;->restoreBackupData([B)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->restoreSoftApBackupData([B)Landroid/net/wifi/SoftApConfiguration;,system-api,test-api
 Landroid/net/wifi/WifiManager;->restoreSupplicantBackupData([B[B)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->retrieveBackupData()[B,system-api,test-api
 Landroid/net/wifi/WifiManager;->retrieveSoftApBackupData()[B,system-api,test-api
+Landroid/net/wifi/WifiManager;->sActiveCountryCodeChangedCallbackMap:Landroid/util/SparseArray;
+Landroid/net/wifi/WifiManager;->sLocalOnlyHotspotSoftApCallbackMap:Landroid/util/SparseArray;
 Landroid/net/wifi/WifiManager;->sNetworkRequestMatchCallbackMap:Landroid/util/SparseArray;
 Landroid/net/wifi/WifiManager;->sOnWifiUsabilityStatsListenerMap:Landroid/util/SparseArray;
 Landroid/net/wifi/WifiManager;->sSoftApCallbackMap:Landroid/util/SparseArray;
@@ -3694,12 +4407,17 @@
 Landroid/net/wifi/WifiManager;->setDeviceMobilityState(I)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->setEmergencyScanRequestInProgress(Z)V
 Landroid/net/wifi/WifiManager;->setEnableAutoJoinWhenAssociated(Z)Z
+Landroid/net/wifi/WifiManager;->setExternalPnoScanRequest(Ljava/util/List;[ILjava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$PnoScanResultsCallback;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->setMacRandomizationSettingPasspointEnabled(Ljava/lang/String;Z)V,system-api,test-api
+Landroid/net/wifi/WifiManager;->setOneShotScreenOnConnectivityScanDelayMillis(I)V
 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;->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
 Landroid/net/wifi/WifiManager;->setSoftApConfiguration(Landroid/net/wifi/SoftApConfiguration;)Z,system-api,test-api
+Landroid/net/wifi/WifiManager;->setSsidsAllowlist(Ljava/util/Set;)V,system-api,test-api
+Landroid/net/wifi/WifiManager;->setStaConcurrencyForMultiInternetMode(I)Z,system-api,test-api
 Landroid/net/wifi/WifiManager;->setTdlsEnabled(Ljava/net/InetAddress;Z)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->setTdlsEnabledWithMacAddress(Ljava/lang/String;Z)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->setVerboseLoggingEnabled(Z)V,system-api,test-api
@@ -3707,6 +4425,7 @@
 Landroid/net/wifi/WifiManager;->setWifiApConfiguration(Landroid/net/wifi/WifiConfiguration;)Z,system-api,test-api
 Landroid/net/wifi/WifiManager;->setWifiConnectedNetworkScorer(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiManager$WifiConnectedNetworkScorer;)Z,system-api,test-api
 Landroid/net/wifi/WifiManager;->setWifiEnabled(Z)Z,public-api,system-api,test-api
+Landroid/net/wifi/WifiManager;->setWifiPasspointEnabled(Z)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->setWifiScoringEnabled(Z)Z,system-api,test-api
 Landroid/net/wifi/WifiManager;->startEasyConnectAsConfiguratorInitiator(Ljava/lang/String;IILjava/util/concurrent/Executor;Landroid/net/wifi/EasyConnectStatusCallback;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->startEasyConnectAsEnrolleeInitiator(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/net/wifi/EasyConnectStatusCallback;)V,system-api,test-api
@@ -3725,8 +4444,10 @@
 Landroid/net/wifi/WifiManager;->stopLocalOnlyHotspot()V
 Landroid/net/wifi/WifiManager;->stopRestrictingAutoJoinToSubscriptionId()V,system-api,test-api
 Landroid/net/wifi/WifiManager;->stopSoftAp()Z,system-api,test-api
+Landroid/net/wifi/WifiManager;->unregisterActiveCountryCodeChangedCallback(Landroid/net/wifi/WifiManager$ActiveCountryCodeChangedCallback;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->unregisterCoexCallback(Landroid/net/wifi/WifiManager$CoexCallback;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->unregisterLocalOnlyHotspotObserver()V
+Landroid/net/wifi/WifiManager;->unregisterLocalOnlyHotspotSoftApCallback(Landroid/net/wifi/WifiManager$SoftApCallback;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->unregisterNetworkRequestMatchCallback(Landroid/net/wifi/WifiManager$NetworkRequestMatchCallback;)V,system-api,test-api
 Landroid/net/wifi/WifiManager;->unregisterScanResultsCallback(Landroid/net/wifi/WifiManager$ScanResultsCallback;)V,public-api,system-api,test-api
 Landroid/net/wifi/WifiManager;->unregisterSoftApCallback(Landroid/net/wifi/WifiManager$SoftApCallback;)V,system-api,test-api
@@ -3864,6 +4585,7 @@
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsInitialAutojoinEnabled:Z
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsNetworkOemPaid:Z
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsNetworkOemPrivate:Z
+Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsNetworkRestricted:Z
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsNetworkUntrusted:Z
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsSharedWithUser:Z
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mIsSharedWithUserSet:Z
@@ -3874,10 +4596,11 @@
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mPriority:I
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mPriorityGroup:I
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mSaeH2eOnlyMode:Z
-Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mSsid:Ljava/lang/String;
+Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mSubscriptionGroup:Landroid/os/ParcelUuid;
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mSubscriptionId:I
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mWapiEnterpriseConfig:Landroid/net/wifi/WifiEnterpriseConfig;
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mWapiPskPassphrase:Ljava/lang/String;
+Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mWifiSsid:Landroid/net/wifi/WifiSsid;
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mWpa2EnterpriseConfig:Landroid/net/wifi/WifiEnterpriseConfig;
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mWpa2PskPassphrase:Ljava/lang/String;
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->mWpa3EnterpriseConfig:Landroid/net/wifi/WifiEnterpriseConfig;
@@ -3900,12 +4623,15 @@
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setPasspointConfig(Landroid/net/wifi/hotspot2/PasspointConfiguration;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setPriority(I)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setPriorityGroup(I)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setRestricted(Z)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setSecurityParamsInWifiConfiguration(Landroid/net/wifi/WifiConfiguration;)V
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setSsid(Ljava/lang/String;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setSubscriptionGroup(Landroid/os/ParcelUuid;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setSubscriptionId(I)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setUntrusted(Z)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setWapiEnterpriseConfig(Landroid/net/wifi/WifiEnterpriseConfig;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setWapiPassphrase(Ljava/lang/String;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setWifiSsid(Landroid/net/wifi/WifiSsid;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setWpa2EnterpriseConfig(Landroid/net/wifi/WifiEnterpriseConfig;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setWpa2Passphrase(Ljava/lang/String;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion$Builder;->setWpa3Enterprise192BitModeConfig(Landroid/net/wifi/WifiEnterpriseConfig;)Landroid/net/wifi/WifiNetworkSuggestion$Builder;,public-api,system-api,test-api
@@ -3924,13 +4650,16 @@
 Landroid/net/wifi/WifiNetworkSuggestion;->getBssid()Landroid/net/MacAddress;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getCarrierId()I,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getEnterpriseConfig()Landroid/net/wifi/WifiEnterpriseConfig;,public-api,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion;->getMacRandomizationSetting()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getPassphrase()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getPasspointConfig()Landroid/net/wifi/hotspot2/PasspointConfiguration;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getPriority()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getPriorityGroup()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getSsid()Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion;->getSubscriptionGroup()Landroid/os/ParcelUuid;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getSubscriptionId()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->getWifiConfiguration()Landroid/net/wifi/WifiConfiguration;,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion;->getWifiSsid()Landroid/net/wifi/WifiSsid;,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->isAppInteractionRequired()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->isAppInteractionRequired:Z
@@ -3943,6 +4672,7 @@
 Landroid/net/wifi/WifiNetworkSuggestion;->isMetered()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->isOemPaid()Z,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->isOemPrivate()Z,system-api,test-api
+Landroid/net/wifi/WifiNetworkSuggestion;->isRestricted()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->isUntrusted()Z,public-api,system-api,test-api
 Landroid/net/wifi/WifiNetworkSuggestion;->isUserAllowedToManuallyConnect:Z
 Landroid/net/wifi/WifiNetworkSuggestion;->isUserInteractionRequired()Z,public-api,system-api,test-api
@@ -4086,11 +4816,11 @@
 Landroid/net/wifi/WifiScanner$ScanSettings$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/WifiScanner$ScanSettings$HiddenNetwork;-><init>(Ljava/lang/String;)V,system-api,test-api
 Landroid/net/wifi/WifiScanner$ScanSettings$HiddenNetwork;->ssid:Ljava/lang/String;,system-api,test-api
+Landroid/net/wifi/WifiScanner$ScanSettings;->-$$Nest$fputmEnable6GhzPsc(Landroid/net/wifi/WifiScanner$ScanSettings;Z)V
+Landroid/net/wifi/WifiScanner$ScanSettings;->-$$Nest$fputmRnrSetting(Landroid/net/wifi/WifiScanner$ScanSettings;I)V
 Landroid/net/wifi/WifiScanner$ScanSettings;-><clinit>()V
 Landroid/net/wifi/WifiScanner$ScanSettings;-><init>()V,system-api,test-api
 Landroid/net/wifi/WifiScanner$ScanSettings;->CREATOR:Landroid/os/Parcelable$Creator;
-Landroid/net/wifi/WifiScanner$ScanSettings;->access$002(Landroid/net/wifi/WifiScanner$ScanSettings;I)I
-Landroid/net/wifi/WifiScanner$ScanSettings;->access$102(Landroid/net/wifi/WifiScanner$ScanSettings;Z)Z
 Landroid/net/wifi/WifiScanner$ScanSettings;->band:I,system-api,test-api
 Landroid/net/wifi/WifiScanner$ScanSettings;->channels:[Landroid/net/wifi/WifiScanner$ChannelSpec;,system-api,test-api
 Landroid/net/wifi/WifiScanner$ScanSettings;->describeContents()I,public-api,system-api,test-api
@@ -4119,17 +4849,17 @@
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/WifiScanner$ActionListener;
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda1;->f$1:Landroid/net/wifi/WifiScanner$OperationResult;
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiScanner$PnoScanListener;Landroid/net/wifi/WifiScanner$ParcelableScanResults;)V
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiScanner$PnoScanListener;
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/WifiScanner$ParcelableScanResults;
+Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;-><init>(Landroid/net/wifi/WifiScanner$ScanListener;Landroid/net/wifi/WifiScanner$ParcelableScanData;)V
+Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;->f$0:Landroid/net/wifi/WifiScanner$ScanListener;
+Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;->f$1:Landroid/net/wifi/WifiScanner$ParcelableScanData;
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda3;-><init>(Landroid/net/wifi/WifiScanner$ScanListener;Landroid/net/wifi/ScanResult;)V
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda3;->f$0:Landroid/net/wifi/WifiScanner$ScanListener;
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda3;->f$1:Landroid/net/wifi/ScanResult;
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiScanner$ScanListener;Landroid/net/wifi/WifiScanner$ParcelableScanData;)V
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;->f$0:Landroid/net/wifi/WifiScanner$ScanListener;
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;->f$1:Landroid/net/wifi/WifiScanner$ParcelableScanData;
+Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;-><init>(Landroid/net/wifi/WifiScanner$PnoScanListener;Landroid/net/wifi/WifiScanner$ParcelableScanResults;)V
+Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;->f$0:Landroid/net/wifi/WifiScanner$PnoScanListener;
+Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;->f$1:Landroid/net/wifi/WifiScanner$ParcelableScanResults;
 Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiScanner$ServiceHandler;-><init>(Landroid/net/wifi/WifiScanner;Landroid/os/Looper;)V
 Landroid/net/wifi/WifiScanner$ServiceHandler;->handleMessage(Landroid/os/Message;)V,public-api,system-api,test-api
@@ -4156,6 +4886,10 @@
 Landroid/net/wifi/WifiScanner$WifiChangeSettings;->rssiSampleSize:I,system-api,test-api
 Landroid/net/wifi/WifiScanner$WifiChangeSettings;->unchangedSampleSize:I,system-api,test-api
 Landroid/net/wifi/WifiScanner$WifiChangeSettings;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiScanner;->-$$Nest$fgetmAsyncChannel(Landroid/net/wifi/WifiScanner;)Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;
+Landroid/net/wifi/WifiScanner;->-$$Nest$fputmAsyncChannel(Landroid/net/wifi/WifiScanner;Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;)V
+Landroid/net/wifi/WifiScanner;->-$$Nest$mgetListenerWithExecutor(Landroid/net/wifi/WifiScanner;I)Landroid/net/wifi/WifiScanner$ListenerWithExecutor;
+Landroid/net/wifi/WifiScanner;->-$$Nest$mremoveListener(Landroid/net/wifi/WifiScanner;I)Ljava/lang/Object;
 Landroid/net/wifi/WifiScanner;-><init>(Landroid/content/Context;Landroid/net/wifi/IWifiScanner;Landroid/os/Looper;)V
 Landroid/net/wifi/WifiScanner;->BASE:I
 Landroid/net/wifi/WifiScanner;->CMD_DEREGISTER_SCAN_LISTENER:I
@@ -4200,6 +4934,7 @@
 Landroid/net/wifi/WifiScanner;->SCAN_TYPE_HIGH_ACCURACY:I,system-api,test-api
 Landroid/net/wifi/WifiScanner;->SCAN_TYPE_LOW_LATENCY:I,system-api,test-api
 Landroid/net/wifi/WifiScanner;->SCAN_TYPE_LOW_POWER:I,system-api,test-api
+Landroid/net/wifi/WifiScanner;->SCAN_TYPE_MAX:I
 Landroid/net/wifi/WifiScanner;->TAG:Ljava/lang/String;
 Landroid/net/wifi/WifiScanner;->WIFI_BAND_24_5_6_60_GHZ:I
 Landroid/net/wifi/WifiScanner;->WIFI_BAND_24_5_6_GHZ:I,system-api,test-api
@@ -4225,19 +4960,18 @@
 Landroid/net/wifi/WifiScanner;->WIFI_RNR_ENABLED:I,system-api,test-api
 Landroid/net/wifi/WifiScanner;->WIFI_RNR_ENABLED_IF_WIFI_BAND_6_GHZ_SCANNED:I,system-api,test-api
 Landroid/net/wifi/WifiScanner;->WIFI_RNR_NOT_NEEDED:I,system-api,test-api
-Landroid/net/wifi/WifiScanner;->access$202(Landroid/net/wifi/WifiScanner;Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;)Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;
-Landroid/net/wifi/WifiScanner;->access$300(Landroid/net/wifi/WifiScanner;I)Landroid/net/wifi/WifiScanner$ListenerWithExecutor;
-Landroid/net/wifi/WifiScanner;->access$400(Landroid/net/wifi/WifiScanner;I)Ljava/lang/Object;
 Landroid/net/wifi/WifiScanner;->addListener(Landroid/net/wifi/WifiScanner$ActionListener;)I
 Landroid/net/wifi/WifiScanner;->addListener(Landroid/net/wifi/WifiScanner$ActionListener;Ljava/util/concurrent/Executor;)I
 Landroid/net/wifi/WifiScanner;->configureWifiChange(IIIII[Landroid/net/wifi/WifiScanner$BssidInfo;)V,system-api,test-api
 Landroid/net/wifi/WifiScanner;->configureWifiChange(Landroid/net/wifi/WifiScanner$WifiChangeSettings;)V,system-api,test-api
 Landroid/net/wifi/WifiScanner;->getAvailableChannels(I)Ljava/util/List;,system-api,test-api
+Landroid/net/wifi/WifiScanner;->getInternalHandler()Landroid/os/Handler;
 Landroid/net/wifi/WifiScanner;->getListenerKey(Ljava/lang/Object;)I
 Landroid/net/wifi/WifiScanner;->getListenerWithExecutor(I)Landroid/net/wifi/WifiScanner$ListenerWithExecutor;
 Landroid/net/wifi/WifiScanner;->getScanResults()Z,system-api,test-api
 Landroid/net/wifi/WifiScanner;->getSingleScanResults()Ljava/util/List;,system-api,test-api
 Landroid/net/wifi/WifiScanner;->isFullBandScan(IZ)Z
+Landroid/net/wifi/WifiScanner;->isScanning()Z,system-api,test-api
 Landroid/net/wifi/WifiScanner;->mAsyncChannel:Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;
 Landroid/net/wifi/WifiScanner;->mContext:Landroid/content/Context;
 Landroid/net/wifi/WifiScanner;->mExecutorMap:Landroid/util/SparseArray;
@@ -4275,26 +5009,38 @@
 Landroid/net/wifi/WifiSsid$1;->newArray(I)[Landroid/net/wifi/WifiSsid;
 Landroid/net/wifi/WifiSsid$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/WifiSsid;-><clinit>()V
-Landroid/net/wifi/WifiSsid;-><init>()V
-Landroid/net/wifi/WifiSsid;-><init>(Landroid/net/wifi/WifiSsid$1;)V
-Landroid/net/wifi/WifiSsid;->CREATOR:Landroid/os/Parcelable$Creator;
-Landroid/net/wifi/WifiSsid;->HEX_RADIX:I
+Landroid/net/wifi/WifiSsid;-><init>([B)V
+Landroid/net/wifi/WifiSsid;-><init>([BLandroid/net/wifi/WifiSsid-IA;)V
+Landroid/net/wifi/WifiSsid;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
 Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;
-Landroid/net/wifi/WifiSsid;->TAG:Ljava/lang/String;
-Landroid/net/wifi/WifiSsid;->convertToBytes(Ljava/lang/String;)V
 Landroid/net/wifi/WifiSsid;->createFromAsciiEncoded(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;
-Landroid/net/wifi/WifiSsid;->createFromByteArray([B)Landroid/net/wifi/WifiSsid;
-Landroid/net/wifi/WifiSsid;->createFromHex(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;
+Landroid/net/wifi/WifiSsid;->decodeSsid([BLjava/nio/charset/Charset;)Ljava/lang/String;
 Landroid/net/wifi/WifiSsid;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiSsid;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiSsid;->getHexString()Ljava/lang/String;
+Landroid/net/wifi/WifiSsid;->fromBytes([B)Landroid/net/wifi/WifiSsid;,public-api,system-api,test-api
+Landroid/net/wifi/WifiSsid;->fromString(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;
+Landroid/net/wifi/WifiSsid;->fromUtf8Text(Ljava/lang/CharSequence;)Landroid/net/wifi/WifiSsid;
+Landroid/net/wifi/WifiSsid;->getBytes()[B,public-api,system-api,test-api
 Landroid/net/wifi/WifiSsid;->getOctets()[B
+Landroid/net/wifi/WifiSsid;->getUtf8Text()Ljava/lang/CharSequence;
 Landroid/net/wifi/WifiSsid;->hashCode()I,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiSsid;->isArrayAllZeroes([B)Z
-Landroid/net/wifi/WifiSsid;->isHidden()Z
+Landroid/net/wifi/WifiSsid;->mBytes:[B
 Landroid/net/wifi/WifiSsid;->octets:Ljava/io/ByteArrayOutputStream;
 Landroid/net/wifi/WifiSsid;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/WifiSsid;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiStringResourceWrapper;-><init>(Landroid/net/wifi/WifiContext;II)V
+Landroid/net/wifi/WifiStringResourceWrapper;->CARRIER_ID_RESOURCE_NAME_SUFFIX:Ljava/lang/String;
+Landroid/net/wifi/WifiStringResourceWrapper;->CARRIER_ID_RESOURCE_SEPARATOR:Ljava/lang/String;
+Landroid/net/wifi/WifiStringResourceWrapper;->TAG:Ljava/lang/String;
+Landroid/net/wifi/WifiStringResourceWrapper;->getCarrierOverrideString(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+Landroid/net/wifi/WifiStringResourceWrapper;->getInt(Ljava/lang/String;I)I
+Landroid/net/wifi/WifiStringResourceWrapper;->getResourcesForSubId()Landroid/content/res/Resources;
+Landroid/net/wifi/WifiStringResourceWrapper;->getString(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+Landroid/net/wifi/WifiStringResourceWrapper;->mCarrierId:I
+Landroid/net/wifi/WifiStringResourceWrapper;->mCarrierIdPrefix:Ljava/lang/String;
+Landroid/net/wifi/WifiStringResourceWrapper;->mContext:Landroid/net/wifi/WifiContext;
+Landroid/net/wifi/WifiStringResourceWrapper;->mResources:Landroid/content/res/Resources;
+Landroid/net/wifi/WifiStringResourceWrapper;->mSubId:I
 Landroid/net/wifi/WifiUsabilityStatsEntry$1;-><init>()V
 Landroid/net/wifi/WifiUsabilityStatsEntry$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/WifiUsabilityStatsEntry;
 Landroid/net/wifi/WifiUsabilityStatsEntry$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -4305,14 +5051,14 @@
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats$1;->newArray(I)[Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->-$$Nest$fputmContentionNumSamples(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->-$$Nest$fputmContentionTimeAvgMicros(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->-$$Nest$fputmContentionTimeMaxMicros(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->-$$Nest$fputmContentionTimeMinMicros(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)V
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;-><clinit>()V
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;-><init>()V
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;-><init>(JJJJ)V,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
-Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->access$002(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)J
-Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->access$102(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)J
-Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->access$202(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)J
-Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->access$302(Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;J)J
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->getContentionNumSamples()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$ContentionTimeStats;->getContentionTimeAvgMicros()J,system-api,test-api
@@ -4328,20 +5074,20 @@
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats$1;->newArray(I)[Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmRadioId(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;I)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalBackgroundScanTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalHotspot2ScanTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalNanScanTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalPnoScanTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalRadioOnTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalRadioRxTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalRadioTxTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalRoamScanTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->-$$Nest$fputmTotalScanTimeMillis(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)V
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;-><clinit>()V
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;-><init>()V
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;-><init>(IJJJJJJJJJ)V,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1302(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;I)I
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1402(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1502(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1602(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1702(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1802(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$1902(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$2002(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$2102(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J
-Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->access$2202(Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;J)J
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->getRadioId()J,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RadioStats;->getTotalBackgroundScanTimeMillis()J,system-api,test-api
@@ -4369,19 +5115,19 @@
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats$1;->newArray(I)[Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmBitRateInKbps(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmBw(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmMpduLost(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmNss(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmPreamble(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmRateMcsIdx(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmRetries(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmRxMpdu(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V
+Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->-$$Nest$fputmTxMpdu(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)V
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;-><clinit>()V
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;-><init>()V
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;-><init>(IIIIIIIII)V,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$1002(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$1102(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$1202(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$402(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$502(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$602(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$702(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$802(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I
-Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->access$902(Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;I)I
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->getBandwidthInMhz()I,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry$RateStats;->getBitRateInKbps()I,system-api,test-api
@@ -4414,12 +5160,14 @@
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_10_MHZ:I,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_160_MHZ:I,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_20_MHZ:I,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_320_MHZ:I,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_40_MHZ:I,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_5_MHZ:I,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_80P80_MHZ:I,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_80_MHZ:I,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_BANDWIDTH_INVALID:I,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_PREAMBLE_CCK:I,system-api,test-api
+Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_PREAMBLE_EHT:I,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_PREAMBLE_HE:I,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_PREAMBLE_HT:I,system-api,test-api
 Landroid/net/wifi/WifiUsabilityStatsEntry;->WIFI_PREAMBLE_INVALID:I,system-api,test-api
@@ -4529,6 +5277,42 @@
 Landroid/net/wifi/aware/AttachCallback;-><init>()V,public-api,system-api,test-api
 Landroid/net/wifi/aware/AttachCallback;->onAttachFailed()V,public-api,system-api,test-api
 Landroid/net/wifi/aware/AttachCallback;->onAttached(Landroid/net/wifi/aware/WifiAwareSession;)V,public-api,system-api,test-api
+Landroid/net/wifi/aware/AttachCallback;->onAwareSessionTerminated()V,public-api,system-api,test-api
+Landroid/net/wifi/aware/AwareParams$1;-><init>()V
+Landroid/net/wifi/aware/AwareParams$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/AwareParams;
+Landroid/net/wifi/aware/AwareParams$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/aware/AwareParams$1;->newArray(I)[Landroid/net/wifi/aware/AwareParams;
+Landroid/net/wifi/aware/AwareParams$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;-><clinit>()V
+Landroid/net/wifi/aware/AwareParams;-><init>()V,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;-><init>(Landroid/os/Parcel;)V
+Landroid/net/wifi/aware/AwareParams;-><init>(Landroid/os/Parcel;Landroid/net/wifi/aware/AwareParams-IA;)V
+Landroid/net/wifi/aware/AwareParams;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->UNSET_PARAMETER:I,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->describeContents()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->getDiscoveryBeaconIntervalMillis()I,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->getDiscoveryWindowWakeInterval24Ghz()I,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->getDiscoveryWindowWakeInterval5Ghz()I,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->getDiscoveryWindowWakeInterval6Ghz()I
+Landroid/net/wifi/aware/AwareParams;->getMacRandomizationIntervalSeconds()I,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->getNumSpatialStreamsInDiscovery()I,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->isDwEarlyTerminationEnabled()Z,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->mDiscoveryBeaconIntervalMs:I
+Landroid/net/wifi/aware/AwareParams;->mDw24Ghz:I
+Landroid/net/wifi/aware/AwareParams;->mDw5Ghz:I
+Landroid/net/wifi/aware/AwareParams;->mDw6Ghz:I
+Landroid/net/wifi/aware/AwareParams;->mIsDwEarlyTerminationEnabled:Z
+Landroid/net/wifi/aware/AwareParams;->mMacRandomIntervalSec:I
+Landroid/net/wifi/aware/AwareParams;->mNumSpatialStreamsInDiscovery:I
+Landroid/net/wifi/aware/AwareParams;->setDiscoveryBeaconIntervalMillis(I)V,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->setDiscoveryWindow6Ghz(I)V
+Landroid/net/wifi/aware/AwareParams;->setDiscoveryWindowWakeInterval24Ghz(I)V,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->setDiscoveryWindowWakeInterval5Ghz(I)V,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->setDwEarlyTerminationEnabled(Z)V,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->setMacRandomizationIntervalSeconds(I)V,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->setNumSpatialStreamsInDiscovery(I)V,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/AwareParams;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/wifi/aware/AwareResources$1;-><init>()V
 Landroid/net/wifi/aware/AwareResources$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/AwareResources;
 Landroid/net/wifi/aware/AwareResources$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -4558,15 +5342,26 @@
 Landroid/net/wifi/aware/Characteristics;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->KEY_IS_INSTANT_COMMUNICATION_MODE_SUPPORTED:Ljava/lang/String;
 Landroid/net/wifi/aware/Characteristics;->KEY_MAX_MATCH_FILTER_LENGTH:Ljava/lang/String;
+Landroid/net/wifi/aware/Characteristics;->KEY_MAX_NDI_NUMBER:Ljava/lang/String;
+Landroid/net/wifi/aware/Characteristics;->KEY_MAX_NDP_NUMBER:Ljava/lang/String;
+Landroid/net/wifi/aware/Characteristics;->KEY_MAX_PUBLISH_NUMBER:Ljava/lang/String;
 Landroid/net/wifi/aware/Characteristics;->KEY_MAX_SERVICE_NAME_LENGTH:Ljava/lang/String;
 Landroid/net/wifi/aware/Characteristics;->KEY_MAX_SERVICE_SPECIFIC_INFO_LENGTH:Ljava/lang/String;
+Landroid/net/wifi/aware/Characteristics;->KEY_MAX_SUBSCRIBE_NUMBER:Ljava/lang/String;
 Landroid/net/wifi/aware/Characteristics;->KEY_SUPPORTED_CIPHER_SUITES:Ljava/lang/String;
+Landroid/net/wifi/aware/Characteristics;->WIFI_AWARE_CIPHER_SUITE_NCS_PK_128:I,public-api,system-api,test-api
+Landroid/net/wifi/aware/Characteristics;->WIFI_AWARE_CIPHER_SUITE_NCS_PK_256:I,public-api,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->WIFI_AWARE_CIPHER_SUITE_NCS_SK_128:I,public-api,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->WIFI_AWARE_CIPHER_SUITE_NCS_SK_256:I,public-api,system-api,test-api
+Landroid/net/wifi/aware/Characteristics;->WIFI_AWARE_CIPHER_SUITE_NONE:I,public-api,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->getMaxMatchFilterLength()I,public-api,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->getMaxServiceNameLength()I,public-api,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->getMaxServiceSpecificInfoLength()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/Characteristics;->getNumberOfSupportedDataInterfaces()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/Characteristics;->getNumberOfSupportedDataPaths()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/Characteristics;->getNumberOfSupportedPublishSessions()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/Characteristics;->getNumberOfSupportedSubscribeSessions()I,public-api,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->getSupportedCipherSuites()I,public-api,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->isInstantCommunicationModeSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/aware/Characteristics;->mCharacteristics:Landroid/os/Bundle;
@@ -4592,7 +5387,7 @@
 Landroid/net/wifi/aware/ConfigRequest$Builder;->setSupport6gBand(Z)Landroid/net/wifi/aware/ConfigRequest$Builder;
 Landroid/net/wifi/aware/ConfigRequest;-><clinit>()V
 Landroid/net/wifi/aware/ConfigRequest;-><init>(ZZIII[I)V
-Landroid/net/wifi/aware/ConfigRequest;-><init>(ZZIII[ILandroid/net/wifi/aware/ConfigRequest$1;)V
+Landroid/net/wifi/aware/ConfigRequest;-><init>(ZZIII[ILandroid/net/wifi/aware/ConfigRequest-IA;)V
 Landroid/net/wifi/aware/ConfigRequest;->CLUSTER_ID_MAX:I
 Landroid/net/wifi/aware/ConfigRequest;->CLUSTER_ID_MIN:I
 Landroid/net/wifi/aware/ConfigRequest;->CREATOR:Landroid/os/Parcelable$Creator;
@@ -4640,7 +5435,9 @@
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onMessageSendSucceeded(I)V,public-api,system-api,test-api
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onPublishStarted(Landroid/net/wifi/aware/PublishDiscoverySession;)V,public-api,system-api,test-api
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onServiceDiscovered(Landroid/net/wifi/aware/PeerHandle;[BLjava/util/List;)V,public-api,system-api,test-api
+Landroid/net/wifi/aware/DiscoverySessionCallback;->onServiceDiscovered(Landroid/net/wifi/aware/ServiceDiscoveryInfo;)V,public-api,system-api,test-api
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onServiceDiscoveredWithinRange(Landroid/net/wifi/aware/PeerHandle;[BLjava/util/List;I)V,public-api,system-api,test-api
+Landroid/net/wifi/aware/DiscoverySessionCallback;->onServiceDiscoveredWithinRange(Landroid/net/wifi/aware/ServiceDiscoveryInfo;I)V,public-api,system-api,test-api
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onServiceLost(Landroid/net/wifi/aware/PeerHandle;I)V,public-api,system-api,test-api
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onSessionConfigFailed()V,public-api,system-api,test-api
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onSessionConfigUpdated()V,public-api,system-api,test-api
@@ -4648,9 +5445,9 @@
 Landroid/net/wifi/aware/DiscoverySessionCallback;->onSubscribeStarted(Landroid/net/wifi/aware/SubscribeDiscoverySession;)V,public-api,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;-><init>()V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMatch(I[B[B)V
+Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMatch(I[B[BI[B)V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMatchExpired(I)V
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMatchWithDistance(I[B[BI)V
+Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMatchWithDistance(I[B[BII[B)V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMessageReceived(I[B)V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMessageSendFail(II)V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Default;->onMessageSendSuccess(I)V
@@ -4662,9 +5459,9 @@
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMatch(I[B[B)V
+Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMatch(I[B[BI[B)V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMatchExpired(I)V
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMatchWithDistance(I[B[BI)V
+Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMatchWithDistance(I[B[BII[B)V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMessageReceived(I[B)V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMessageSendFail(II)V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onMessageSendSuccess(I)V
@@ -4672,7 +5469,6 @@
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onSessionConfigSuccess()V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onSessionStarted(I)V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->onSessionTerminated(I)V
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;-><init>()V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->TRANSACTION_onMatch:I
@@ -4687,12 +5483,10 @@
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->TRANSACTION_onSessionTerminated:I
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->getDefaultImpl()Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback$Stub;->setDefaultImpl(Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)Z
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMatch(I[B[B)V
+Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMatch(I[B[BI[B)V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMatchExpired(I)V
-Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMatchWithDistance(I[B[BI)V
+Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMatchWithDistance(I[B[BII[B)V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMessageReceived(I[B)V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMessageSendFail(II)V
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onMessageSendSuccess(I)V
@@ -4702,6 +5496,7 @@
 Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;->onSessionTerminated(I)V
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Default;-><init>()V
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/aware/IWifiAwareEventCallback$Default;->onAttachTerminate()V
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Default;->onConnectFail(I)V
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Default;->onConnectSuccess(I)V
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Default;->onIdentityChanged([B)V
@@ -4709,61 +5504,60 @@
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
+Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->onAttachTerminate()V
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->onConnectFail(I)V
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->onConnectSuccess(I)V
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->onIdentityChanged([B)V
-Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/aware/IWifiAwareEventCallback;
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;-><init>()V
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->DESCRIPTOR:Ljava/lang/String;
+Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->TRANSACTION_onAttachTerminate:I
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->TRANSACTION_onConnectFail:I
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->TRANSACTION_onConnectSuccess:I
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->TRANSACTION_onIdentityChanged:I
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/aware/IWifiAwareEventCallback;
-Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->getDefaultImpl()Landroid/net/wifi/aware/IWifiAwareEventCallback;
 Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareEventCallback$Stub;->setDefaultImpl(Landroid/net/wifi/aware/IWifiAwareEventCallback;)Z
+Landroid/net/wifi/aware/IWifiAwareEventCallback;->onAttachTerminate()V
 Landroid/net/wifi/aware/IWifiAwareEventCallback;->onConnectFail(I)V
 Landroid/net/wifi/aware/IWifiAwareEventCallback;->onConnectSuccess(I)V
 Landroid/net/wifi/aware/IWifiAwareEventCallback;->onIdentityChanged([B)V
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Default;-><init>()V
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Default;->macAddress(Ljava/util/Map;)V
+Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Default;->macAddress([Landroid/net/wifi/aware/MacAddrMapping;)V
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->macAddress(Ljava/util/Map;)V
-Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;
+Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub$Proxy;->macAddress([Landroid/net/wifi/aware/MacAddrMapping;)V
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;-><init>()V
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->TRANSACTION_macAddress:I
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;
-Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->getDefaultImpl()Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;
 Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareMacAddressProvider$Stub;->setDefaultImpl(Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;)Z
-Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;->macAddress(Ljava/util/Map;)V
+Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;->macAddress([Landroid/net/wifi/aware/MacAddrMapping;)V
 Landroid/net/wifi/aware/IWifiAwareManager$Default;-><init>()V
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareManager$Default;->connect(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;Z)V
+Landroid/net/wifi/aware/IWifiAwareManager$Default;->connect(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;ZLandroid/os/Bundle;)V
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->disconnect(ILandroid/os/IBinder;)V
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->enableInstantCommunicationMode(Ljava/lang/String;Z)V
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->getAvailableAwareResources()Landroid/net/wifi/aware/AwareResources;
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->getCharacteristics()Landroid/net/wifi/aware/Characteristics;
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->isDeviceAttached()Z
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->isInstantCommunicationModeEnabled()Z
+Landroid/net/wifi/aware/IWifiAwareManager$Default;->isSetChannelOnDataPathSupported()Z
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->isUsageEnabled()Z
-Landroid/net/wifi/aware/IWifiAwareManager$Default;->publish(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V
-Landroid/net/wifi/aware/IWifiAwareManager$Default;->requestMacAddresses(ILjava/util/List;Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V
+Landroid/net/wifi/aware/IWifiAwareManager$Default;->publish(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;Landroid/os/Bundle;)V
+Landroid/net/wifi/aware/IWifiAwareManager$Default;->requestMacAddresses(I[ILandroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->sendMessage(III[BII)V
-Landroid/net/wifi/aware/IWifiAwareManager$Default;->subscribe(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V
+Landroid/net/wifi/aware/IWifiAwareManager$Default;->setAwareParams(Landroid/net/wifi/aware/AwareParams;)V
+Landroid/net/wifi/aware/IWifiAwareManager$Default;->subscribe(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;Landroid/os/Bundle;)V
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->terminateSession(II)V
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->updatePublish(IILandroid/net/wifi/aware/PublishConfig;)V
 Landroid/net/wifi/aware/IWifiAwareManager$Default;->updateSubscribe(IILandroid/net/wifi/aware/SubscribeConfig;)V
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->connect(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;Z)V
+Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->connect(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;ZLandroid/os/Bundle;)V
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->disconnect(ILandroid/os/IBinder;)V
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->enableInstantCommunicationMode(Ljava/lang/String;Z)V
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->getAvailableAwareResources()Landroid/net/wifi/aware/AwareResources;
@@ -4771,13 +5565,14 @@
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->isDeviceAttached()Z
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->isInstantCommunicationModeEnabled()Z
+Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->isSetChannelOnDataPathSupported()Z
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->isUsageEnabled()Z
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->publish(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V
-Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->requestMacAddresses(ILjava/util/List;Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V
-Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/aware/IWifiAwareManager;
+Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->publish(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;Landroid/os/Bundle;)V
+Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->requestMacAddresses(I[ILandroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->sendMessage(III[BII)V
-Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->subscribe(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V
+Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->setAwareParams(Landroid/net/wifi/aware/AwareParams;)V
+Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->subscribe(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;Landroid/os/Bundle;)V
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->terminateSession(II)V
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->updatePublish(IILandroid/net/wifi/aware/PublishConfig;)V
 Landroid/net/wifi/aware/IWifiAwareManager$Stub$Proxy;->updateSubscribe(IILandroid/net/wifi/aware/SubscribeConfig;)V
@@ -4790,36 +5585,51 @@
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_getCharacteristics:I
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_isDeviceAttached:I
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_isInstantCommunicationModeEnabled:I
+Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_isSetChannelOnDataPathSupported:I
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_isUsageEnabled:I
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_publish:I
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_requestMacAddresses:I
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_sendMessage:I
+Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_setAwareParams:I
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_subscribe:I
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_terminateSession:I
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_updatePublish:I
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->TRANSACTION_updateSubscribe:I
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/aware/IWifiAwareManager;
-Landroid/net/wifi/aware/IWifiAwareManager$Stub;->getDefaultImpl()Landroid/net/wifi/aware/IWifiAwareManager;
 Landroid/net/wifi/aware/IWifiAwareManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/aware/IWifiAwareManager$Stub;->setDefaultImpl(Landroid/net/wifi/aware/IWifiAwareManager;)Z
-Landroid/net/wifi/aware/IWifiAwareManager;->connect(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;Z)V
+Landroid/net/wifi/aware/IWifiAwareManager;->connect(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/aware/IWifiAwareEventCallback;Landroid/net/wifi/aware/ConfigRequest;ZLandroid/os/Bundle;)V
 Landroid/net/wifi/aware/IWifiAwareManager;->disconnect(ILandroid/os/IBinder;)V
 Landroid/net/wifi/aware/IWifiAwareManager;->enableInstantCommunicationMode(Ljava/lang/String;Z)V
 Landroid/net/wifi/aware/IWifiAwareManager;->getAvailableAwareResources()Landroid/net/wifi/aware/AwareResources;
 Landroid/net/wifi/aware/IWifiAwareManager;->getCharacteristics()Landroid/net/wifi/aware/Characteristics;
 Landroid/net/wifi/aware/IWifiAwareManager;->isDeviceAttached()Z
 Landroid/net/wifi/aware/IWifiAwareManager;->isInstantCommunicationModeEnabled()Z
+Landroid/net/wifi/aware/IWifiAwareManager;->isSetChannelOnDataPathSupported()Z
 Landroid/net/wifi/aware/IWifiAwareManager;->isUsageEnabled()Z
-Landroid/net/wifi/aware/IWifiAwareManager;->publish(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V
-Landroid/net/wifi/aware/IWifiAwareManager;->requestMacAddresses(ILjava/util/List;Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V
+Landroid/net/wifi/aware/IWifiAwareManager;->publish(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;Landroid/os/Bundle;)V
+Landroid/net/wifi/aware/IWifiAwareManager;->requestMacAddresses(I[ILandroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V
 Landroid/net/wifi/aware/IWifiAwareManager;->sendMessage(III[BII)V
-Landroid/net/wifi/aware/IWifiAwareManager;->subscribe(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;)V
+Landroid/net/wifi/aware/IWifiAwareManager;->setAwareParams(Landroid/net/wifi/aware/AwareParams;)V
+Landroid/net/wifi/aware/IWifiAwareManager;->subscribe(Ljava/lang/String;Ljava/lang/String;ILandroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/IWifiAwareDiscoverySessionCallback;Landroid/os/Bundle;)V
 Landroid/net/wifi/aware/IWifiAwareManager;->terminateSession(II)V
 Landroid/net/wifi/aware/IWifiAwareManager;->updatePublish(IILandroid/net/wifi/aware/PublishConfig;)V
 Landroid/net/wifi/aware/IWifiAwareManager;->updateSubscribe(IILandroid/net/wifi/aware/SubscribeConfig;)V
 Landroid/net/wifi/aware/IdentityChangedListener;-><init>()V,public-api,system-api,test-api
 Landroid/net/wifi/aware/IdentityChangedListener;->onIdentityChanged([B)V,public-api,system-api,test-api
+Landroid/net/wifi/aware/MacAddrMapping$1;-><init>()V
+Landroid/net/wifi/aware/MacAddrMapping$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/MacAddrMapping;
+Landroid/net/wifi/aware/MacAddrMapping$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/aware/MacAddrMapping$1;->newArray(I)[Landroid/net/wifi/aware/MacAddrMapping;
+Landroid/net/wifi/aware/MacAddrMapping$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/aware/MacAddrMapping;-><clinit>()V
+Landroid/net/wifi/aware/MacAddrMapping;-><init>()V
+Landroid/net/wifi/aware/MacAddrMapping;->CREATOR:Landroid/os/Parcelable$Creator;
+Landroid/net/wifi/aware/MacAddrMapping;->describeContents()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/MacAddrMapping;->macAddress:[B
+Landroid/net/wifi/aware/MacAddrMapping;->peerId:I
+Landroid/net/wifi/aware/MacAddrMapping;->readFromParcel(Landroid/os/Parcel;)V
+Landroid/net/wifi/aware/MacAddrMapping;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/wifi/aware/ParcelablePeerHandle$1;-><init>()V
 Landroid/net/wifi/aware/ParcelablePeerHandle$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/ParcelablePeerHandle;
 Landroid/net/wifi/aware/ParcelablePeerHandle$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -4841,13 +5651,18 @@
 Landroid/net/wifi/aware/PublishConfig$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig$Builder;-><init>()V,public-api,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig$Builder;->build()Landroid/net/wifi/aware/PublishConfig;,public-api,system-api,test-api
+Landroid/net/wifi/aware/PublishConfig$Builder;->mBand:I
+Landroid/net/wifi/aware/PublishConfig$Builder;->mEnableInstantMode:Z
 Landroid/net/wifi/aware/PublishConfig$Builder;->mEnableRanging:Z
 Landroid/net/wifi/aware/PublishConfig$Builder;->mEnableTerminateNotification:Z
 Landroid/net/wifi/aware/PublishConfig$Builder;->mMatchFilter:[B
 Landroid/net/wifi/aware/PublishConfig$Builder;->mPublishType:I
+Landroid/net/wifi/aware/PublishConfig$Builder;->mSecurityConfig:Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;
 Landroid/net/wifi/aware/PublishConfig$Builder;->mServiceName:[B
 Landroid/net/wifi/aware/PublishConfig$Builder;->mServiceSpecificInfo:[B
 Landroid/net/wifi/aware/PublishConfig$Builder;->mTtlSec:I
+Landroid/net/wifi/aware/PublishConfig$Builder;->setDataPathSecurityConfig(Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/aware/PublishConfig$Builder;->setInstantCommunicationModeEnabled(ZI)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig$Builder;->setMatchFilter(Ljava/util/List;)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig$Builder;->setPublishType(I)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig$Builder;->setRangingEnabled(Z)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,system-api,test-api
@@ -4856,18 +5671,24 @@
 Landroid/net/wifi/aware/PublishConfig$Builder;->setTerminateNotificationEnabled(Z)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig$Builder;->setTtlSec(I)Landroid/net/wifi/aware/PublishConfig$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig;-><clinit>()V
-Landroid/net/wifi/aware/PublishConfig;-><init>([B[B[BIIZZ)V
+Landroid/net/wifi/aware/PublishConfig;-><init>([B[B[BIIZZZILandroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;)V
 Landroid/net/wifi/aware/PublishConfig;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig;->PUBLISH_TYPE_SOLICITED:I,public-api,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig;->PUBLISH_TYPE_UNSOLICITED:I,public-api,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig;->assertValid(Landroid/net/wifi/aware/Characteristics;Z)V
 Landroid/net/wifi/aware/PublishConfig;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/PublishConfig;->getInstantCommunicationBand()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/PublishConfig;->getSecurityConfig()Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;,public-api,system-api,test-api
 Landroid/net/wifi/aware/PublishConfig;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/PublishConfig;->isInstantCommunicationModeEnabled()Z,public-api,system-api,test-api
+Landroid/net/wifi/aware/PublishConfig;->mBand:I
+Landroid/net/wifi/aware/PublishConfig;->mEnableInstantMode:Z
 Landroid/net/wifi/aware/PublishConfig;->mEnableRanging:Z
 Landroid/net/wifi/aware/PublishConfig;->mEnableTerminateNotification:Z
 Landroid/net/wifi/aware/PublishConfig;->mMatchFilter:[B
 Landroid/net/wifi/aware/PublishConfig;->mPublishType:I
+Landroid/net/wifi/aware/PublishConfig;->mSecurityConfig:Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;
 Landroid/net/wifi/aware/PublishConfig;->mServiceName:[B
 Landroid/net/wifi/aware/PublishConfig;->mServiceSpecificInfo:[B
 Landroid/net/wifi/aware/PublishConfig;->mTtlSec:I
@@ -4876,6 +5697,17 @@
 Landroid/net/wifi/aware/PublishDiscoverySession;-><init>(Landroid/net/wifi/aware/WifiAwareManager;II)V
 Landroid/net/wifi/aware/PublishDiscoverySession;->TAG:Ljava/lang/String;
 Landroid/net/wifi/aware/PublishDiscoverySession;->updatePublish(Landroid/net/wifi/aware/PublishConfig;)V,public-api,system-api,test-api
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;-><init>(Landroid/net/wifi/aware/PeerHandle;I[BLjava/util/List;[B)V
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->getMatchFilters()Ljava/util/List;,public-api,system-api,test-api
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->getPeerCipherSuite()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->getPeerHandle()Landroid/net/wifi/aware/PeerHandle;,public-api,system-api,test-api
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->getScid()[B,public-api,system-api,test-api
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->getServiceSpecificInfo()[B,public-api,system-api,test-api
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->mMatchFilters:Ljava/util/List;
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->mPeerCipherSuite:I
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->mPeerHandle:Landroid/net/wifi/aware/PeerHandle;
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->mScid:[B
+Landroid/net/wifi/aware/ServiceDiscoveryInfo;->mServiceSpecificInfo:[B
 Landroid/net/wifi/aware/SubscribeConfig$1;-><init>()V
 Landroid/net/wifi/aware/SubscribeConfig$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/SubscribeConfig;
 Landroid/net/wifi/aware/SubscribeConfig$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -4883,6 +5715,8 @@
 Landroid/net/wifi/aware/SubscribeConfig$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig$Builder;-><init>()V,public-api,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->build()Landroid/net/wifi/aware/SubscribeConfig;,public-api,system-api,test-api
+Landroid/net/wifi/aware/SubscribeConfig$Builder;->mBand:I
+Landroid/net/wifi/aware/SubscribeConfig$Builder;->mEnableInstantMode:Z
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->mEnableTerminateNotification:Z
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->mMatchFilter:[B
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->mMaxDistanceMm:I
@@ -4893,6 +5727,7 @@
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->mServiceSpecificInfo:[B
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->mSubscribeType:I
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->mTtlSec:I
+Landroid/net/wifi/aware/SubscribeConfig$Builder;->setInstantCommunicationModeEnabled(ZI)Landroid/net/wifi/aware/SubscribeConfig$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->setMatchFilter(Ljava/util/List;)Landroid/net/wifi/aware/SubscribeConfig$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->setMaxDistanceMm(I)Landroid/net/wifi/aware/SubscribeConfig$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->setMinDistanceMm(I)Landroid/net/wifi/aware/SubscribeConfig$Builder;,public-api,system-api,test-api
@@ -4902,14 +5737,18 @@
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->setTerminateNotificationEnabled(Z)Landroid/net/wifi/aware/SubscribeConfig$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig$Builder;->setTtlSec(I)Landroid/net/wifi/aware/SubscribeConfig$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig;-><clinit>()V
-Landroid/net/wifi/aware/SubscribeConfig;-><init>([B[B[BIIZZIZI)V
+Landroid/net/wifi/aware/SubscribeConfig;-><init>([B[B[BIIZZIZIZI)V
 Landroid/net/wifi/aware/SubscribeConfig;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig;->SUBSCRIBE_TYPE_ACTIVE:I,public-api,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig;->SUBSCRIBE_TYPE_PASSIVE:I,public-api,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig;->assertValid(Landroid/net/wifi/aware/Characteristics;Z)V
 Landroid/net/wifi/aware/SubscribeConfig;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/SubscribeConfig;->getInstantCommunicationBand()I,public-api,system-api,test-api
 Landroid/net/wifi/aware/SubscribeConfig;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/SubscribeConfig;->isInstantCommunicationModeEnabled()Z,public-api,system-api,test-api
+Landroid/net/wifi/aware/SubscribeConfig;->mBand:I
+Landroid/net/wifi/aware/SubscribeConfig;->mEnableInstantMode:Z
 Landroid/net/wifi/aware/SubscribeConfig;->mEnableTerminateNotification:Z
 Landroid/net/wifi/aware/SubscribeConfig;->mMatchFilter:[B
 Landroid/net/wifi/aware/SubscribeConfig;->mMaxDistanceMm:I
@@ -4950,9 +5789,9 @@
 Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->putZeroLengthElement(I)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;
 Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->setByteOrder(Ljava/nio/ByteOrder;)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;
 Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;->wrap([B)Landroid/net/wifi/aware/TlvBufferUtils$TlvConstructor;
+Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->-$$Nest$fgetmRefArray(Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;)[B
 Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;-><init>(II[BI)V
-Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;-><init>(II[BILandroid/net/wifi/aware/TlvBufferUtils$1;)V
-Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->access$400(Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;)[B
+Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;-><init>(II[BILandroid/net/wifi/aware/TlvBufferUtils$TlvElement-IA;)V
 Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->byteOrder:Ljava/nio/ByteOrder;
 Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->getByte()B
 Landroid/net/wifi/aware/TlvBufferUtils$TlvElement;->getInt()I
@@ -4970,12 +5809,12 @@
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable$1;->next()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable$1;->remove()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable$1;->this$0:Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;
+Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->-$$Nest$fgetmArray(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)[B
+Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->-$$Nest$fgetmArrayLength(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)I
+Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->-$$Nest$fgetmByteOrder(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)Ljava/nio/ByteOrder;
+Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->-$$Nest$fgetmLengthSize(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)I
+Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->-$$Nest$fgetmTypeSize(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)I
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;-><init>(II[B)V
-Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->access$500(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)I
-Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->access$600(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)I
-Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->access$700(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)[B
-Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->access$800(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)Ljava/nio/ByteOrder;
-Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->access$900(Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;)I
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->iterator()Ljava/util/Iterator;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->mArray:[B
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->mArrayLength:I
@@ -4985,11 +5824,11 @@
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->setByteOrder(Ljava/nio/ByteOrder;)V
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->toList()Ljava/util/List;
 Landroid/net/wifi/aware/TlvBufferUtils$TlvIterable;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/TlvBufferUtils;->-$$Nest$smpeekInt([BILjava/nio/ByteOrder;)I
+Landroid/net/wifi/aware/TlvBufferUtils;->-$$Nest$smpeekShort([BILjava/nio/ByteOrder;)S
+Landroid/net/wifi/aware/TlvBufferUtils;->-$$Nest$smpokeInt([BIILjava/nio/ByteOrder;)V
+Landroid/net/wifi/aware/TlvBufferUtils;->-$$Nest$smpokeShort([BISLjava/nio/ByteOrder;)V
 Landroid/net/wifi/aware/TlvBufferUtils;-><init>()V
-Landroid/net/wifi/aware/TlvBufferUtils;->access$000([BISLjava/nio/ByteOrder;)V
-Landroid/net/wifi/aware/TlvBufferUtils;->access$100([BIILjava/nio/ByteOrder;)V
-Landroid/net/wifi/aware/TlvBufferUtils;->access$200([BILjava/nio/ByteOrder;)S
-Landroid/net/wifi/aware/TlvBufferUtils;->access$300([BILjava/nio/ByteOrder;)I
 Landroid/net/wifi/aware/TlvBufferUtils;->isValid([BII)Z
 Landroid/net/wifi/aware/TlvBufferUtils;->isValidEndian([BIILjava/nio/ByteOrder;)Z
 Landroid/net/wifi/aware/TlvBufferUtils;->peekInt([BILjava/nio/ByteOrder;)I
@@ -5015,6 +5854,7 @@
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier$ByteArrayWrapper;->mData:[B
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier$ByteArrayWrapper;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier$ByteArrayWrapper;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->-$$Nest$fgetmNetworkSpecifiers(Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;)Ljava/util/Set;
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;-><clinit>()V
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;-><init>()V
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;-><init>(Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;)V
@@ -5022,7 +5862,6 @@
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->CREATOR:Landroid/os/Parcelable$Creator;
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->TAG:Ljava/lang/String;
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->VDBG:Z
-Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->access$000(Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;)Ljava/util/Set;
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->canBeSatisfiedBy(Landroid/net/NetworkSpecifier;)Z,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->convert(Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;)Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier$ByteArrayWrapper;
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->describeContents()I,public-api,system-api,test-api
@@ -5036,9 +5875,66 @@
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->satisfiesAwareNetworkSpecifier(Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;)Z
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareAgentNetworkSpecifier;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo$1;-><init>()V
+Landroid/net/wifi/aware/WifiAwareChannelInfo$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/WifiAwareChannelInfo;
+Landroid/net/wifi/aware/WifiAwareChannelInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo$1;->newArray(I)[Landroid/net/wifi/aware/WifiAwareChannelInfo;
+Landroid/net/wifi/aware/WifiAwareChannelInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;-><clinit>()V
+Landroid/net/wifi/aware/WifiAwareChannelInfo;-><init>(III)V
+Landroid/net/wifi/aware/WifiAwareChannelInfo;-><init>(Landroid/os/Parcel;)V
+Landroid/net/wifi/aware/WifiAwareChannelInfo;-><init>(Landroid/os/Parcel;Landroid/net/wifi/aware/WifiAwareChannelInfo-IA;)V
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->describeContents()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->getChannelBandwidth()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->getChannelFrequencyMhz()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->getSpatialStreamCount()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->mChannelBandwidth:I
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->mChannelFreq:I
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->mNumSpatialStreams:I
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareChannelInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$1;-><init>()V
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$1;->newArray(I)[Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;-><init>(I)V,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->build()Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->mCipherSuite:I
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->mPassphrase:Ljava/lang/String;
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->mPmk:[B
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->mPmkId:[B
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->setPmk([B)Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->setPmkId([B)Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;->setPskPassphrase(Ljava/lang/String;)Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;-><clinit>()V
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;-><init>(I[B[BLjava/lang/String;)V
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;-><init>(Landroid/os/Parcel;)V
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;-><init>(Landroid/os/Parcel;Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig-IA;)V
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->describeContents()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->getCipherSuite()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->getPmk()[B,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->getPmkId()[B,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->getPskPassphrase()Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->isValid()Z
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->mCipherSuite:I
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->mPassphrase:Ljava/lang/String;
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->mPmk:[B
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->mPmkId:[B
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy$1;-><init>(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;Landroid/os/Looper;)V
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy$1;->handleMessage(Landroid/os/Message;)V,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy$1;->this$0:Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->-$$Nest$fgetmAwareManager(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;)Ljava/lang/ref/WeakReference;
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->-$$Nest$fgetmOriginalCallback(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;)Landroid/net/wifi/aware/DiscoverySessionCallback;
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->-$$Nest$fgetmSession(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;)Landroid/net/wifi/aware/DiscoverySession;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;-><init>(Landroid/net/wifi/aware/WifiAwareManager;Landroid/os/Looper;ZLandroid/net/wifi/aware/DiscoverySessionCallback;I)V
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_MATCH:I
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_MATCH_EXPIRED:I
@@ -5050,21 +5946,20 @@
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_SESSION_CONFIG_SUCCESS:I
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_SESSION_STARTED:I
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->CALLBACK_SESSION_TERMINATED:I
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->MESSAGE_BUNDLE_KEY_CIPHER_SUITE:Ljava/lang/String;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->MESSAGE_BUNDLE_KEY_MESSAGE2:Ljava/lang/String;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->MESSAGE_BUNDLE_KEY_MESSAGE:Ljava/lang/String;
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->access$200(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;)Ljava/lang/ref/WeakReference;
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->access$300(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;)Landroid/net/wifi/aware/DiscoverySessionCallback;
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->access$400(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;)Landroid/net/wifi/aware/DiscoverySession;
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->MESSAGE_BUNDLE_KEY_SCID:Ljava/lang/String;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mAwareManager:Ljava/lang/ref/WeakReference;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mClientId:I
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mHandler:Landroid/os/Handler;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mIsPublish:Z
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mOriginalCallback:Landroid/net/wifi/aware/DiscoverySessionCallback;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->mSession:Landroid/net/wifi/aware/DiscoverySession;
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatch(I[B[B)V
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatchCommon(II[B[BI)V
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatch(I[B[BI[B)V
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatchCommon(II[B[BII[B)V
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatchExpired(I)V
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatchWithDistance(I[B[BI)V
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMatchWithDistance(I[B[BII[B)V
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMessageReceived(I[B)V
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMessageSendFail(II)V
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareDiscoverySessionCallbackProxy;->onMessageSendSuccess(I)V
@@ -5079,22 +5974,26 @@
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy$1;->this$0:Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy$1;->val$attachCallback:Landroid/net/wifi/aware/AttachCallback;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy$1;->val$identityChangedListener:Landroid/net/wifi/aware/IdentityChangedListener;
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->-$$Nest$fgetmAwareManager(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;)Ljava/lang/ref/WeakReference;
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->-$$Nest$fgetmBinder(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;)Landroid/os/Binder;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;-><init>(Landroid/net/wifi/aware/WifiAwareManager;Landroid/os/Looper;Landroid/os/Binder;Landroid/net/wifi/aware/AttachCallback;Landroid/net/wifi/aware/IdentityChangedListener;)V
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->CALLBACK_ATTACH_TERMINATE:I
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->CALLBACK_CONNECT_FAIL:I
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->CALLBACK_CONNECT_SUCCESS:I
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->CALLBACK_IDENTITY_CHANGED:I
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->access$000(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;)Ljava/lang/ref/WeakReference;
-Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->access$100(Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;)Landroid/os/Binder;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->mAwareManager:Ljava/lang/ref/WeakReference;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->mBinder:Landroid/os/Binder;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->mHandler:Landroid/os/Handler;
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->mLooper:Landroid/os/Looper;
+Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->onAttachTerminate()V
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->onConnectFail(I)V
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->onConnectSuccess(I)V
 Landroid/net/wifi/aware/WifiAwareManager$WifiAwareEventCallbackProxy;->onIdentityChanged([B)V
 Landroid/net/wifi/aware/WifiAwareManager;-><init>(Landroid/content/Context;Landroid/net/wifi/aware/IWifiAwareManager;)V
+Landroid/net/wifi/aware/WifiAwareManager;->ACTION_WIFI_AWARE_RESOURCE_CHANGED:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->ACTION_WIFI_AWARE_STATE_CHANGED:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->DBG:Z
+Landroid/net/wifi/aware/WifiAwareManager;->EXTRA_AWARE_RESOURCES:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->TAG:Ljava/lang/String;
 Landroid/net/wifi/aware/WifiAwareManager;->VDBG:Z
 Landroid/net/wifi/aware/WifiAwareManager;->WIFI_AWARE_DATA_PATH_ROLE_INITIATOR:I,public-api,system-api,test-api
@@ -5113,12 +6012,14 @@
 Landroid/net/wifi/aware/WifiAwareManager;->isAvailable()Z,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->isDeviceAttached()Z,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->isInstantCommunicationModeEnabled()Z,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareManager;->isSetChannelOnDataPathSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->mContext:Landroid/content/Context;
 Landroid/net/wifi/aware/WifiAwareManager;->mLock:Ljava/lang/Object;
 Landroid/net/wifi/aware/WifiAwareManager;->mService:Landroid/net/wifi/aware/IWifiAwareManager;
 Landroid/net/wifi/aware/WifiAwareManager;->publish(ILandroid/os/Looper;Landroid/net/wifi/aware/PublishConfig;Landroid/net/wifi/aware/DiscoverySessionCallback;)V
-Landroid/net/wifi/aware/WifiAwareManager;->requestMacAddresses(ILjava/util/List;Landroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V
+Landroid/net/wifi/aware/WifiAwareManager;->requestMacAddresses(I[ILandroid/net/wifi/aware/IWifiAwareMacAddressProvider;)V
 Landroid/net/wifi/aware/WifiAwareManager;->sendMessage(IILandroid/net/wifi/aware/PeerHandle;[BII)V
+Landroid/net/wifi/aware/WifiAwareManager;->setAwareParams(Landroid/net/wifi/aware/AwareParams;)V,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareManager;->subscribe(ILandroid/os/Looper;Landroid/net/wifi/aware/SubscribeConfig;Landroid/net/wifi/aware/DiscoverySessionCallback;)V
 Landroid/net/wifi/aware/WifiAwareManager;->terminateSession(II)V
 Landroid/net/wifi/aware/WifiAwareManager;->updatePublish(IILandroid/net/wifi/aware/PublishConfig;)V
@@ -5132,14 +6033,16 @@
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;-><init>()V
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;-><init>(Landroid/net/wifi/aware/WifiAwareNetworkInfo;)V
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;-><init>(Ljava/net/Inet6Address;)V
-Landroid/net/wifi/aware/WifiAwareNetworkInfo;-><init>(Ljava/net/Inet6Address;II)V
+Landroid/net/wifi/aware/WifiAwareNetworkInfo;-><init>(Ljava/net/Inet6Address;IILjava/util/List;)V
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkInfo;->getChannelInfoList()Ljava/util/List;,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->getPeerIpv6Addr()Ljava/net/Inet6Address;,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->getPort()I,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->getTransportProtocol()I,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkInfo;->mChannelInfos:Ljava/util/List;
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->mIpv6Addr:Ljava/net/Inet6Address;
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->mPort:I
 Landroid/net/wifi/aware/WifiAwareNetworkInfo;->mTransportProtocol:I
@@ -5153,17 +6056,23 @@
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;-><init>(Landroid/net/wifi/aware/DiscoverySession;Landroid/net/wifi/aware/PeerHandle;)V,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;-><init>(Landroid/net/wifi/aware/PublishDiscoverySession;)V,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->build()Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mChannel:I
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mDiscoverySession:Landroid/net/wifi/aware/DiscoverySession;
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mIsRequired:Z
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mPeerHandle:Landroid/net/wifi/aware/PeerHandle;
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mPmk:[B
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mPort:I
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mPskPassphrase:Ljava/lang/String;
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mSecurityConfig:Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->mTransportProtocol:I
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->setChannelFrequencyMhz(IZ)Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->setDataPathSecurityConfig(Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;)Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->setPmk([B)Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->setPort(I)Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->setPskPassphrase(Ljava/lang/String;)Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;->setTransportProtocol(I)Landroid/net/wifi/aware/WifiAwareNetworkSpecifier$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;-><clinit>()V
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;-><init>(IIIII[BIIIZLandroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;)V
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;-><init>(IIIII[B[BLjava/lang/String;II)V
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->NETWORK_SPECIFIER_TYPE_IB:I
@@ -5175,8 +6084,14 @@
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->clientId:I
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->getChannelFrequencyMhz()I,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->getWifiAwareDataPathSecurityConfig()Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->isChannelRequired()Z,public-api,system-api,test-api
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->isOutOfBand()Z
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->mChannelInMhz:I
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->mForcedChannel:Z
+Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->mSecurityConfig:Landroid/net/wifi/aware/WifiAwareDataPathSecurityConfig;
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->passphrase:Ljava/lang/String;
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->peerId:I
 Landroid/net/wifi/aware/WifiAwareNetworkSpecifier;->peerMac:[B
@@ -5209,14 +6124,15 @@
 Landroid/net/wifi/aware/WifiAwareUtils;->isLegacyVersion(Landroid/content/Context;I)Z
 Landroid/net/wifi/aware/WifiAwareUtils;->validatePassphrase(Ljava/lang/String;)Z
 Landroid/net/wifi/aware/WifiAwareUtils;->validatePmk([B)Z
+Landroid/net/wifi/aware/WifiAwareUtils;->validatePmkId([B)Z
 Landroid/net/wifi/aware/WifiAwareUtils;->validateServiceName([B)V
 Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;-><init>()V
-Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;-><init>(Landroid/net/wifi/hotspot2/ConfigParser$1;)V
+Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;-><init>(Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader-IA;)V
 Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;->boundary:Ljava/lang/String;
 Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;->contentType:Ljava/lang/String;
 Landroid/net/wifi/hotspot2/ConfigParser$MimeHeader;->encodingType:Ljava/lang/String;
 Landroid/net/wifi/hotspot2/ConfigParser$MimePart;-><init>()V
-Landroid/net/wifi/hotspot2/ConfigParser$MimePart;-><init>(Landroid/net/wifi/hotspot2/ConfigParser$1;)V
+Landroid/net/wifi/hotspot2/ConfigParser$MimePart;-><init>(Landroid/net/wifi/hotspot2/ConfigParser$MimePart-IA;)V
 Landroid/net/wifi/hotspot2/ConfigParser$MimePart;->data:[B
 Landroid/net/wifi/hotspot2/ConfigParser$MimePart;->isLast:Z
 Landroid/net/wifi/hotspot2/ConfigParser$MimePart;->type:Ljava/lang/String;
@@ -5252,7 +6168,6 @@
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub$Proxy;->onProvisioningComplete()V
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub$Proxy;->onProvisioningFailure(I)V
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub$Proxy;->onProvisioningStatus(I)V
-Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/hotspot2/IProvisioningCallback;
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;-><init>()V
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->TRANSACTION_onProvisioningComplete:I
@@ -5260,9 +6175,7 @@
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->TRANSACTION_onProvisioningStatus:I
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/hotspot2/IProvisioningCallback;
-Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->getDefaultImpl()Landroid/net/wifi/hotspot2/IProvisioningCallback;
 Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/hotspot2/IProvisioningCallback$Stub;->setDefaultImpl(Landroid/net/wifi/hotspot2/IProvisioningCallback;)Z
 Landroid/net/wifi/hotspot2/IProvisioningCallback;->onProvisioningComplete()V
 Landroid/net/wifi/hotspot2/IProvisioningCallback;->onProvisioningFailure(I)V
 Landroid/net/wifi/hotspot2/IProvisioningCallback;->onProvisioningStatus(I)V
@@ -5303,6 +6216,17 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration$1;->newArray(I)[Landroid/net/wifi/hotspot2/PasspointConfiguration;
 Landroid/net/wifi/hotspot2/PasspointConfiguration$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration$1;->readTrustRootCerts(Landroid/os/Parcel;)Ljava/util/Map;
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmCarrierId(Landroid/net/wifi/hotspot2/PasspointConfiguration;I)V
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmDecoratedIdentityPrefix(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)V
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmIsAutojoinEnabled(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)V
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmIsCarrierMerged(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)V
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmIsMacRandomizationEnabled(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)V
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmIsNonPersistentMacRandomizationEnabled(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)V
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmIsOemPaid(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)V
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmIsOemPrivate(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)V
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmMeteredOverride(Landroid/net/wifi/hotspot2/PasspointConfiguration;I)V
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmSubscriptionGroup(Landroid/net/wifi/hotspot2/PasspointConfiguration;Landroid/os/ParcelUuid;)V
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->-$$Nest$fputmSubscriptionId(Landroid/net/wifi/hotspot2/PasspointConfiguration;I)V
 Landroid/net/wifi/hotspot2/PasspointConfiguration;-><clinit>()V
 Landroid/net/wifi/hotspot2/PasspointConfiguration;-><init>()V,public-api,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;-><init>(Landroid/net/wifi/hotspot2/PasspointConfiguration;)V,public-api,system-api,test-api
@@ -5311,16 +6235,6 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->MAX_URL_BYTES:I
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->NULL_VALUE:I
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->TAG:Ljava/lang/String;
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$002(Landroid/net/wifi/hotspot2/PasspointConfiguration;I)I
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$102(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)Z
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$202(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)Z
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$302(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)Z
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$402(Landroid/net/wifi/hotspot2/PasspointConfiguration;I)I
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$502(Landroid/net/wifi/hotspot2/PasspointConfiguration;I)I
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$602(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)Z
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$702(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)Z
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$802(Landroid/net/wifi/hotspot2/PasspointConfiguration;Z)Z
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->access$902(Landroid/net/wifi/hotspot2/PasspointConfiguration;Ljava/lang/String;)Ljava/lang/String;
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getAaaServerTrustedNames()[Ljava/lang/String;
@@ -5335,6 +6249,7 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getServiceFriendlyNames()Ljava/util/Map;
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionCreationTimeInMillis()J
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionExpirationTimeMillis()J,public-api,system-api,test-api
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionGroup()Landroid/os/ParcelUuid;
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionId()I
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionType()Ljava/lang/String;
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->getSubscriptionUpdate()Landroid/net/wifi/hotspot2/pps/UpdateParameter;
@@ -5348,8 +6263,8 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->isAutojoinEnabled()Z,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->isCarrierMerged()Z
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->isEnhancedMacRandomizationEnabled()Z
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->isMacRandomizationEnabled()Z,system-api,test-api
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->isNonPersistentMacRandomizationEnabled()Z
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->isOemPaid()Z
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->isOemPrivate()Z
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->isOsuProvisioned()Z,public-api,system-api,test-api
@@ -5362,8 +6277,8 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mHomeSp:Landroid/net/wifi/hotspot2/pps/HomeSp;
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsAutojoinEnabled:Z
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsCarrierMerged:Z
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsEnhancedMacRandomizationEnabled:Z
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsMacRandomizationEnabled:Z
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsNonPersistentMacRandomizationEnabled:Z
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsOemPaid:Z
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mIsOemPrivate:Z
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mMeteredOverride:I
@@ -5371,6 +6286,7 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mServiceFriendlyNames:Ljava/util/Map;
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionCreationTimeInMillis:J
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionExpirationTimeMillis:J
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionGroup:Landroid/os/ParcelUuid;
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionId:I
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionType:Ljava/lang/String;
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->mSubscriptionUpdate:Landroid/net/wifi/hotspot2/pps/UpdateParameter;
@@ -5387,16 +6303,17 @@
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setCredential(Landroid/net/wifi/hotspot2/pps/Credential;)V,public-api,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setCredentialPriority(I)V
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setDecoratedIdentityPrefix(Ljava/lang/String;)V,public-api,system-api,test-api
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->setEnhancedMacRandomizationEnabled(Z)V
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setHomeSp(Landroid/net/wifi/hotspot2/pps/HomeSp;)V,public-api,system-api,test-api
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setMacRandomizationEnabled(Z)V
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setMeteredOverride(I)V
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->setNonPersistentMacRandomizationEnabled(Z)V
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setOemPaid(Z)V
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setOemPrivate(Z)V
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setPolicy(Landroid/net/wifi/hotspot2/pps/Policy;)V
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setServiceFriendlyNames(Ljava/util/Map;)V
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionCreationTimeInMillis(J)V
-Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionExpirationTimeInMillis(J)V
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionExpirationTimeInMillis(J)V,public-api,system-api,test-api
+Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionGroup(Landroid/os/ParcelUuid;)V
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionId(I)V
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionType(Ljava/lang/String;)V
 Landroid/net/wifi/hotspot2/PasspointConfiguration;->setSubscriptionUpdate(Landroid/net/wifi/hotspot2/pps/UpdateParameter;)V
@@ -5909,7 +6826,7 @@
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->TAG:Ljava/lang/String;
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_CHECK_INTERVAL_NEVER:J
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_OMADM:Ljava/lang/String;
-Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_SSP:Ljava/lang/String;
+Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_METHOD_SPP:Ljava/lang/String;
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_HOMESP:Ljava/lang/String;
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_ROAMING_PARTNER:Ljava/lang/String;
 Landroid/net/wifi/hotspot2/pps/UpdateParameter;->UPDATE_RESTRICTION_UNRESTRICTED:Ljava/lang/String;
@@ -5950,18 +6867,19 @@
 Landroid/net/wifi/p2p/IWifiP2pManager$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/IWifiP2pManager$Default;->checkConfigureWifiDisplayPermission()V
 Landroid/net/wifi/p2p/IWifiP2pManager$Default;->close(Landroid/os/IBinder;)V
-Landroid/net/wifi/p2p/IWifiP2pManager$Default;->getMessenger(Landroid/os/IBinder;Ljava/lang/String;)Landroid/os/Messenger;
+Landroid/net/wifi/p2p/IWifiP2pManager$Default;->getMessenger(Landroid/os/IBinder;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Messenger;
 Landroid/net/wifi/p2p/IWifiP2pManager$Default;->getP2pStateMachineMessenger()Landroid/os/Messenger;
+Landroid/net/wifi/p2p/IWifiP2pManager$Default;->getSupportedFeatures()J
 Landroid/net/wifi/p2p/IWifiP2pManager$Default;->setMiracastMode(I)V
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->checkConfigureWifiDisplayPermission()V
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->close(Landroid/os/IBinder;)V
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
-Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->getMessenger(Landroid/os/IBinder;Ljava/lang/String;)Landroid/os/Messenger;
+Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->getMessenger(Landroid/os/IBinder;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Messenger;
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->getP2pStateMachineMessenger()Landroid/os/Messenger;
+Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->getSupportedFeatures()J
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/p2p/IWifiP2pManager;
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub$Proxy;->setMiracastMode(I)V
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;-><init>()V
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->DESCRIPTOR:Ljava/lang/String;
@@ -5969,16 +6887,16 @@
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_close:I
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_getMessenger:I
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_getP2pStateMachineMessenger:I
+Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_getSupportedFeatures:I
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->TRANSACTION_setMiracastMode:I
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/p2p/IWifiP2pManager;
-Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->getDefaultImpl()Landroid/net/wifi/p2p/IWifiP2pManager;
 Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/p2p/IWifiP2pManager$Stub;->setDefaultImpl(Landroid/net/wifi/p2p/IWifiP2pManager;)Z
 Landroid/net/wifi/p2p/IWifiP2pManager;->checkConfigureWifiDisplayPermission()V
 Landroid/net/wifi/p2p/IWifiP2pManager;->close(Landroid/os/IBinder;)V
-Landroid/net/wifi/p2p/IWifiP2pManager;->getMessenger(Landroid/os/IBinder;Ljava/lang/String;)Landroid/os/Messenger;
+Landroid/net/wifi/p2p/IWifiP2pManager;->getMessenger(Landroid/os/IBinder;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Messenger;
 Landroid/net/wifi/p2p/IWifiP2pManager;->getP2pStateMachineMessenger()Landroid/os/Messenger;
+Landroid/net/wifi/p2p/IWifiP2pManager;->getSupportedFeatures()J
 Landroid/net/wifi/p2p/IWifiP2pManager;->setMiracastMode(I)V
 Landroid/net/wifi/p2p/WifiP2pConfig$1;-><init>()V
 Landroid/net/wifi/p2p/WifiP2pConfig$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/p2p/WifiP2pConfig;
@@ -6033,6 +6951,7 @@
 Landroid/net/wifi/p2p/WifiP2pDevice$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice$1;->newArray(I)[Landroid/net/wifi/p2p/WifiP2pDevice;
 Landroid/net/wifi/p2p/WifiP2pDevice$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pDevice;->-$$Nest$fputmVendorElements(Landroid/net/wifi/p2p/WifiP2pDevice;Ljava/util/List;)V
 Landroid/net/wifi/p2p/WifiP2pDevice;-><clinit>()V
 Landroid/net/wifi/p2p/WifiP2pDevice;-><init>()V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;-><init>(Landroid/net/wifi/p2p/WifiP2pDevice;)V,public-api,system-api,test-api
@@ -6066,6 +6985,7 @@
 Landroid/net/wifi/p2p/WifiP2pDevice;->deviceCapability:I
 Landroid/net/wifi/p2p/WifiP2pDevice;->deviceName:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pDevice;->getVendorElements()Ljava/util/List;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;->getWfdInfo()Landroid/net/wifi/p2p/WifiP2pWfdInfo;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;->groupCapability:I
 Landroid/net/wifi/p2p/WifiP2pDevice;->hashCode()I,core-platform-api,public-api,system-api,test-api
@@ -6074,9 +6994,11 @@
 Landroid/net/wifi/p2p/WifiP2pDevice;->isGroupOwner()Z,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;->isInvitationCapable()Z
 Landroid/net/wifi/p2p/WifiP2pDevice;->isServiceDiscoveryCapable()Z,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pDevice;->mVendorElements:Ljava/util/List;
 Landroid/net/wifi/p2p/WifiP2pDevice;->parseHex(Ljava/lang/String;)I
 Landroid/net/wifi/p2p/WifiP2pDevice;->primaryDeviceType:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;->secondaryDeviceType:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pDevice;->setVendorElements(Ljava/util/List;)V
 Landroid/net/wifi/p2p/WifiP2pDevice;->status:I,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pDevice;->threeTokenPattern:Ljava/util/regex/Pattern;
 Landroid/net/wifi/p2p/WifiP2pDevice;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
@@ -6172,13 +7094,13 @@
 Landroid/net/wifi/p2p/WifiP2pGroupList$2;->newArray(I)[Landroid/net/wifi/p2p/WifiP2pGroupList;
 Landroid/net/wifi/p2p/WifiP2pGroupList$2;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pGroupList$GroupDeleteListener;->onDeleteGroup(I)V
+Landroid/net/wifi/p2p/WifiP2pGroupList;->-$$Nest$fgetisClearCalled(Landroid/net/wifi/p2p/WifiP2pGroupList;)Z
+Landroid/net/wifi/p2p/WifiP2pGroupList;->-$$Nest$fgetmListener(Landroid/net/wifi/p2p/WifiP2pGroupList;)Landroid/net/wifi/p2p/WifiP2pGroupList$GroupDeleteListener;
 Landroid/net/wifi/p2p/WifiP2pGroupList;-><clinit>()V
 Landroid/net/wifi/p2p/WifiP2pGroupList;-><init>()V
 Landroid/net/wifi/p2p/WifiP2pGroupList;-><init>(Landroid/net/wifi/p2p/WifiP2pGroupList;Landroid/net/wifi/p2p/WifiP2pGroupList$GroupDeleteListener;)V
 Landroid/net/wifi/p2p/WifiP2pGroupList;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pGroupList;->CREDENTIAL_MAX_NUM:I
-Landroid/net/wifi/p2p/WifiP2pGroupList;->access$000(Landroid/net/wifi/p2p/WifiP2pGroupList;)Landroid/net/wifi/p2p/WifiP2pGroupList$GroupDeleteListener;
-Landroid/net/wifi/p2p/WifiP2pGroupList;->access$100(Landroid/net/wifi/p2p/WifiP2pGroupList;)Z
 Landroid/net/wifi/p2p/WifiP2pGroupList;->add(Landroid/net/wifi/p2p/WifiP2pGroup;)V
 Landroid/net/wifi/p2p/WifiP2pGroupList;->clear()Z
 Landroid/net/wifi/p2p/WifiP2pGroupList;->contains(I)Z
@@ -6214,21 +7136,23 @@
 Landroid/net/wifi/p2p/WifiP2pManager$Channel$P2pHandler;-><init>(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/os/Looper;)V
 Landroid/net/wifi/p2p/WifiP2pManager$Channel$P2pHandler;->handleMessage(Landroid/os/Message;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$Channel$P2pHandler;->this$0:Landroid/net/wifi/p2p/WifiP2pManager$Channel;
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fgetmAsyncChannel(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fgetmChannelListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fgetmHandler(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Landroid/net/wifi/p2p/WifiP2pManager$Channel$P2pHandler;
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fputmChannelListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;)V
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fputmDnsSdServRspListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$DnsSdServiceResponseListener;)V
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fputmDnsSdTxtListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$DnsSdTxtRecordListener;)V
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fputmServRspListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ServiceResponseListener;)V
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$fputmUpnpServRspListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$UpnpServiceResponseListener;)V
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$mgetListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;I)Ljava/lang/Object;
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$mhandleServiceResponse(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;)V
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$mputListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/Object;)I
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->-$$Nest$mremoveListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;I)Ljava/lang/Object;
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;-><init>(Landroid/content/Context;Landroid/os/Looper;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;Landroid/os/Binder;Landroid/net/wifi/p2p/WifiP2pManager;)V
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->INVALID_LISTENER_KEY:I
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$000(Landroid/net/wifi/p2p/WifiP2pManager$Channel;I)Ljava/lang/Object;
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$100(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$102(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;)Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$200(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;)V
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$300(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Landroid/net/wifi/p2p/WifiP2pManager$Channel$P2pHandler;
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$400(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$500(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/Object;)I
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$602(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ServiceResponseListener;)Landroid/net/wifi/p2p/WifiP2pManager$ServiceResponseListener;
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$702(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$DnsSdServiceResponseListener;)Landroid/net/wifi/p2p/WifiP2pManager$DnsSdServiceResponseListener;
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$802(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$DnsSdTxtRecordListener;)Landroid/net/wifi/p2p/WifiP2pManager$DnsSdTxtRecordListener;
-Landroid/net/wifi/p2p/WifiP2pManager$Channel;->access$902(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$UpnpServiceResponseListener;)Landroid/net/wifi/p2p/WifiP2pManager$UpnpServiceResponseListener;
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->close()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->finalize()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->getBinder()Landroid/os/Binder;
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->getListener(I)Ljava/lang/Object;
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->handleDnsSdServiceResponse(Landroid/net/wifi/p2p/nsd/WifiP2pDnsSdServiceResponse;)V
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->handleServiceResponse(Landroid/net/wifi/p2p/nsd/WifiP2pServiceResponse;)V
@@ -6248,12 +7172,24 @@
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mServRspListener:Landroid/net/wifi/p2p/WifiP2pManager$ServiceResponseListener;
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mUpnpServRspListener:Landroid/net/wifi/p2p/WifiP2pManager$UpnpServiceResponseListener;
 Landroid/net/wifi/p2p/WifiP2pManager$Channel;->putListener(Ljava/lang/Object;)I
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->removeListener(I)Ljava/lang/Object;
 Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;->onChannelDisconnected()V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$ConnectionInfoListener;->onConnectionInfoAvailable(Landroid/net/wifi/p2p/WifiP2pInfo;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$DeviceInfoListener;->onDeviceInfoAvailable(Landroid/net/wifi/p2p/WifiP2pDevice;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$DiscoveryStateListener;->onDiscoveryStateAvailable(I)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$DnsSdServiceResponseListener;->onDnsSdServiceAvailable(Ljava/lang/String;Ljava/lang/String;Landroid/net/wifi/p2p/WifiP2pDevice;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$DnsSdTxtRecordListener;->onDnsSdTxtRecordAvailable(Ljava/lang/String;Ljava/util/Map;Landroid/net/wifi/p2p/WifiP2pDevice;)V,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->APPROVER_DETACH_REASON_CLOSE:I,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->APPROVER_DETACH_REASON_FAILURE:I,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->APPROVER_DETACH_REASON_REMOVE:I,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->APPROVER_DETACH_REASON_REPLACE:I,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->REQUEST_TYPE_INVITATION:I,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->REQUEST_TYPE_JOIN:I,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->REQUEST_TYPE_NEGOTIATION:I,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->onAttached(Landroid/net/MacAddress;)V,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->onConnectionRequested(ILandroid/net/wifi/p2p/WifiP2pConfig;Landroid/net/wifi/p2p/WifiP2pDevice;)V,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->onDetached(Landroid/net/MacAddress;I)V,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;->onPinGenerated(Landroid/net/MacAddress;Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$GroupInfoListener;->onGroupInfoAvailable(Landroid/net/wifi/p2p/WifiP2pGroup;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager$HandoverMessageListener;->onHandoverMessageAvailable(Ljava/lang/String;)V
 Landroid/net/wifi/p2p/WifiP2pManager$NetworkInfoListener;->onNetworkInfoAvailable(Landroid/net/NetworkInfo;)V,public-api,system-api,test-api
@@ -6265,6 +7201,8 @@
 Landroid/net/wifi/p2p/WifiP2pManager$UpnpServiceResponseListener;->onUpnpServiceAvailable(Ljava/util/List;Landroid/net/wifi/p2p/WifiP2pDevice;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;-><init>(Landroid/net/wifi/p2p/IWifiP2pManager;)V
 Landroid/net/wifi/p2p/WifiP2pManager;->ACTION_WIFI_P2P_PERSISTENT_GROUPS_CHANGED:Ljava/lang/String;,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->ACTION_WIFI_P2P_REQUEST_RESPONSE_CHANGED:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->ADD_EXTERNAL_APPROVER:I
 Landroid/net/wifi/p2p/WifiP2pManager;->ADD_LOCAL_SERVICE:I
 Landroid/net/wifi/p2p/WifiP2pManager;->ADD_LOCAL_SERVICE_FAILED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->ADD_LOCAL_SERVICE_SUCCEEDED:I
@@ -6286,6 +7224,10 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->CLEAR_SERVICE_REQUESTS_FAILED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->CLEAR_SERVICE_REQUESTS_SUCCEEDED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->CONNECT:I
+Landroid/net/wifi/p2p/WifiP2pManager;->CONNECTION_REQUEST_ACCEPT:I,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->CONNECTION_REQUEST_DEFER_SHOW_PIN_TO_SERVICE:I,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->CONNECTION_REQUEST_DEFER_TO_SERVICE:I,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->CONNECTION_REQUEST_REJECT:I,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->CONNECT_FAILED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->CONNECT_SUCCEEDED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->CREATE_GROUP:I
@@ -6301,10 +7243,25 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->DISCOVER_SERVICES_FAILED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->DISCOVER_SERVICES_SUCCEEDED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->ERROR:I,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTERNAL_APPROVER_ATTACH:I
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTERNAL_APPROVER_CONNECTION_REQUESTED:I
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTERNAL_APPROVER_DETACH:I
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTERNAL_APPROVER_PIN_GENERATED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_DISCOVERY_STATE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_HANDOVER_MESSAGE:Ljava/lang/String;
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_NETWORK_INFO:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_P2P_DEVICE_LIST:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_CONFIG:Ljava/lang/String;
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_DEVICE:Ljava/lang/String;
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_DISPLAY_ID:Ljava/lang/String;
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_INFORMATION_ELEMENT_LIST:Ljava/lang/String;
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_INTERNAL_MESSAGE:Ljava/lang/String;
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_PEER_ADDRESS:Ljava/lang/String;
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_PEER_DISCOVERY_FREQ:Ljava/lang/String;
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_SERVICE_INFO:Ljava/lang/String;
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_PARAM_KEY_WPS_PIN:Ljava/lang/String;
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_REQUEST_CONFIG:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_REQUEST_RESPONSE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_WIFI_P2P_DEVICE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_WIFI_P2P_GROUP:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->EXTRA_WIFI_P2P_INFO:Ljava/lang/String;,public-api,system-api,test-api
@@ -6312,6 +7269,9 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->FACTORY_RESET:I
 Landroid/net/wifi/p2p/WifiP2pManager;->FACTORY_RESET_FAILED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->FACTORY_RESET_SUCCEEDED:I
+Landroid/net/wifi/p2p/WifiP2pManager;->FEATURE_FLEXIBLE_DISCOVERY:J
+Landroid/net/wifi/p2p/WifiP2pManager;->FEATURE_GROUP_CLIENT_REMOVAL:J
+Landroid/net/wifi/p2p/WifiP2pManager;->FEATURE_SET_VENDOR_ELEMENTS:J
 Landroid/net/wifi/p2p/WifiP2pManager;->GET_HANDOVER_REQUEST:I
 Landroid/net/wifi/p2p/WifiP2pManager;->GET_HANDOVER_SELECT:I
 Landroid/net/wifi/p2p/WifiP2pManager;->INITIATOR_REPORT_NFC_HANDOVER:I
@@ -6321,6 +7281,12 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->NO_SERVICE_REQUESTS:I,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->P2P_UNSUPPORTED:I,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->PING:I
+Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_CLIENT:I
+Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_CLIENT_FAILED:I
+Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_CLIENT_SUCCEEDED:I
+Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_EXTERNAL_APPROVER:I
+Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_EXTERNAL_APPROVER_FAILED:I
+Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_EXTERNAL_APPROVER_SUCCEEDED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_GROUP:I
 Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_GROUP_FAILED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->REMOVE_GROUP_SUCCEEDED:I
@@ -6356,12 +7322,18 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_CHANNEL:I
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_CHANNEL_FAILED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_CHANNEL_SUCCEEDED:I
+Landroid/net/wifi/p2p/WifiP2pManager;->SET_CONNECTION_REQUEST_RESULT:I
+Landroid/net/wifi/p2p/WifiP2pManager;->SET_CONNECTION_REQUEST_RESULT_FAILED:I
+Landroid/net/wifi/p2p/WifiP2pManager;->SET_CONNECTION_REQUEST_RESULT_SUCCEEDED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_DEVICE_NAME:I
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_DEVICE_NAME_FAILED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_DEVICE_NAME_SUCCEEDED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_ONGOING_PEER_CONFIG:I
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_ONGOING_PEER_CONFIG_FAILED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_ONGOING_PEER_CONFIG_SUCCEEDED:I
+Landroid/net/wifi/p2p/WifiP2pManager;->SET_VENDOR_ELEMENTS:I
+Landroid/net/wifi/p2p/WifiP2pManager;->SET_VENDOR_ELEMENTS_FAILED:I
+Landroid/net/wifi/p2p/WifiP2pManager;->SET_VENDOR_ELEMENTS_SUCCEEDED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_WFD_INFO:I
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_WFD_INFO_FAILED:I
 Landroid/net/wifi/p2p/WifiP2pManager;->SET_WFD_INFO_SUCCEEDED:I
@@ -6384,10 +7356,16 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_DISCOVERY_STARTED:I,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_DISCOVERY_STOPPED:I,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_PEERS_CHANGED_ACTION:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_SCAN_FREQ_UNSPECIFIED:I
+Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_SCAN_FULL:I
+Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_SCAN_SINGLE_FREQ:I
+Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_SCAN_SOCIAL:I
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_STATE_CHANGED_ACTION:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_STATE_DISABLED:I,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_STATE_ENABLED:I,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_THIS_DEVICE_CHANGED_ACTION:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->WIFI_P2P_VENDOR_ELEMENTS_MAXIMUM_LENGTH:I
+Landroid/net/wifi/p2p/WifiP2pManager;->addExternalApprover(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/MacAddress;Landroid/net/wifi/p2p/WifiP2pManager$ExternalApproverRequestListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->addLocalService(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/nsd/WifiP2pServiceInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->addServiceRequest(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->cancelConnect(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
@@ -6402,18 +7380,29 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->createGroup(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->deletePersistentGroup(Landroid/net/wifi/p2p/WifiP2pManager$Channel;ILandroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->discoverPeers(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->discoverPeersOnSocialChannels(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->discoverPeersOnSpecificFrequency(Landroid/net/wifi/p2p/WifiP2pManager$Channel;ILandroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->discoverServices(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->factoryReset(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,system-api,test-api
-Landroid/net/wifi/p2p/WifiP2pManager;->getMessenger(Landroid/os/Binder;)Landroid/os/Messenger;
-Landroid/net/wifi/p2p/WifiP2pManager;->getMessenger(Landroid/os/Binder;Ljava/lang/String;)Landroid/os/Messenger;
+Landroid/net/wifi/p2p/WifiP2pManager;->getMessenger(Landroid/os/Binder;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Messenger;
 Landroid/net/wifi/p2p/WifiP2pManager;->getNfcHandoverRequest(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$HandoverMessageListener;)V
 Landroid/net/wifi/p2p/WifiP2pManager;->getNfcHandoverSelect(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$HandoverMessageListener;)V
+Landroid/net/wifi/p2p/WifiP2pManager;->getP2pMaxAllowedVendorElementsLengthBytes()I,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->getP2pStateMachineMessenger()Landroid/os/Messenger;
+Landroid/net/wifi/p2p/WifiP2pManager;->getSupportedFeatures()J
 Landroid/net/wifi/p2p/WifiP2pManager;->initialize(Landroid/content/Context;Landroid/os/Looper;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;)Landroid/net/wifi/p2p/WifiP2pManager$Channel;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->initializeChannel(Landroid/content/Context;Landroid/os/Looper;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;Landroid/os/Messenger;Landroid/os/Binder;)Landroid/net/wifi/p2p/WifiP2pManager$Channel;
 Landroid/net/wifi/p2p/WifiP2pManager;->initializeInternal(Landroid/content/Context;Landroid/os/Looper;Landroid/net/wifi/p2p/WifiP2pManager$ChannelListener;)Landroid/net/wifi/p2p/WifiP2pManager$Channel;
 Landroid/net/wifi/p2p/WifiP2pManager;->initiatorReportNfcHandover(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/String;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V
+Landroid/net/wifi/p2p/WifiP2pManager;->isChannelConstrainedDiscoverySupported()Z,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->isFeatureSupported(J)Z
+Landroid/net/wifi/p2p/WifiP2pManager;->isGroupClientRemovalSupported()Z,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->isSetVendorElementsSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->mService:Landroid/net/wifi/p2p/IWifiP2pManager;
+Landroid/net/wifi/p2p/WifiP2pManager;->prepareExtrasBundle(Landroid/content/Context;)Landroid/os/Bundle;
+Landroid/net/wifi/p2p/WifiP2pManager;->prepareExtrasBundle(Landroid/net/wifi/p2p/WifiP2pManager$Channel;)Landroid/os/Bundle;
+Landroid/net/wifi/p2p/WifiP2pManager;->removeClient(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/MacAddress;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->removeExternalApprover(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/MacAddress;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->removeGroup(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->removeLocalService(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/nsd/WifiP2pServiceInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->removeServiceRequest(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
@@ -6427,18 +7416,21 @@
 Landroid/net/wifi/p2p/WifiP2pManager;->requestPeers(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$PeerListListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->requestPersistentGroupInfo(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$PersistentGroupInfoListener;)V,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->responderReportNfcHandover(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/String;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V
+Landroid/net/wifi/p2p/WifiP2pManager;->setConnectionRequestResult(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/MacAddress;ILandroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->setConnectionRequestResult(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/MacAddress;ILjava/lang/String;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setDeviceName(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/String;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setDnsSdResponseListeners(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$DnsSdServiceResponseListener;Landroid/net/wifi/p2p/WifiP2pManager$DnsSdTxtRecordListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setMiracastMode(I)V,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setOngoingPeerConfig(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pConfig;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V
 Landroid/net/wifi/p2p/WifiP2pManager;->setServiceResponseListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ServiceResponseListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setUpnpServiceResponseListener(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$UpnpServiceResponseListener;)V,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->setVendorElements(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/util/List;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setWFDInfo(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pWfdInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V
 Landroid/net/wifi/p2p/WifiP2pManager;->setWfdInfo(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pWfdInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->setWifiP2pChannels(Landroid/net/wifi/p2p/WifiP2pManager$Channel;IILandroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,system-api,test-api
-Landroid/net/wifi/p2p/WifiP2pManager;->startListening(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->startListening(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->startWps(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/WpsInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V
-Landroid/net/wifi/p2p/WifiP2pManager;->stopListening(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pManager;->stopListening(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pManager;->stopPeerDiscovery(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pProvDiscEvent;-><init>()V
 Landroid/net/wifi/p2p/WifiP2pProvDiscEvent;-><init>(Ljava/lang/String;)V
@@ -6456,6 +7448,7 @@
 Landroid/net/wifi/p2p/WifiP2pWfdInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pWfdInfo$1;->newArray(I)[Landroid/net/wifi/p2p/WifiP2pWfdInfo;
 Landroid/net/wifi/p2p/WifiP2pWfdInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/p2p/WifiP2pWfdInfo;->-$$Nest$mreadFromParcel(Landroid/net/wifi/p2p/WifiP2pWfdInfo;Landroid/os/Parcel;)V
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;-><clinit>()V
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;-><init>()V,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;-><init>(III)V
@@ -6481,7 +7474,6 @@
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;->PREFERRED_CONNECTIVITY_TDLS:I,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;->SESSION_AVAILABLE_BIT1:I
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;->SESSION_AVAILABLE_BIT2:I
-Landroid/net/wifi/p2p/WifiP2pWfdInfo;->access$000(Landroid/net/wifi/p2p/WifiP2pWfdInfo;Landroid/os/Parcel;)V
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;->getControlPort()I,public-api,system-api,test-api
 Landroid/net/wifi/p2p/WifiP2pWfdInfo;->getDeviceInfo()I,public-api,system-api,test-api
@@ -6577,7 +7569,7 @@
 Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;-><clinit>()V
 Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;-><init>(IIILjava/lang/String;)V
-Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;-><init>(IIILjava/lang/String;Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest$1;)V
+Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;-><init>(IIILjava/lang/String;Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest-IA;)V
 Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;-><init>(ILjava/lang/String;)V
 Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;->CREATOR:Landroid/os/Parcelable$Creator;
 Landroid/net/wifi/p2p/nsd/WifiP2pServiceRequest;->describeContents()I,public-api,system-api,test-api
@@ -6651,7 +7643,7 @@
 Landroid/net/wifi/rtt/CivicLocation$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/CivicLocation;-><clinit>()V
 Landroid/net/wifi/rtt/CivicLocation;-><init>(Landroid/os/Parcel;)V
-Landroid/net/wifi/rtt/CivicLocation;-><init>(Landroid/os/Parcel;Landroid/net/wifi/rtt/CivicLocation$1;)V
+Landroid/net/wifi/rtt/CivicLocation;-><init>(Landroid/os/Parcel;Landroid/net/wifi/rtt/CivicLocation-IA;)V
 Landroid/net/wifi/rtt/CivicLocation;-><init>([BLjava/lang/String;)V
 Landroid/net/wifi/rtt/CivicLocation;->ADDRESS_LINE_0_ROOM_DESK_FLOOR:I
 Landroid/net/wifi/rtt/CivicLocation;->ADDRESS_LINE_1_NUMBER_ROAD_SUFFIX_APT:I
@@ -6726,31 +7718,27 @@
 Landroid/net/wifi/rtt/IRttCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
 Landroid/net/wifi/rtt/IRttCallback$Stub$Proxy;->onRangingFailure(I)V
 Landroid/net/wifi/rtt/IRttCallback$Stub$Proxy;->onRangingResults(Ljava/util/List;)V
-Landroid/net/wifi/rtt/IRttCallback$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/rtt/IRttCallback;
 Landroid/net/wifi/rtt/IRttCallback$Stub;-><init>()V
 Landroid/net/wifi/rtt/IRttCallback$Stub;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/rtt/IRttCallback$Stub;->TRANSACTION_onRangingFailure:I
 Landroid/net/wifi/rtt/IRttCallback$Stub;->TRANSACTION_onRangingResults:I
 Landroid/net/wifi/rtt/IRttCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/IRttCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/rtt/IRttCallback;
-Landroid/net/wifi/rtt/IRttCallback$Stub;->getDefaultImpl()Landroid/net/wifi/rtt/IRttCallback;
 Landroid/net/wifi/rtt/IRttCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/rtt/IRttCallback$Stub;->setDefaultImpl(Landroid/net/wifi/rtt/IRttCallback;)Z
 Landroid/net/wifi/rtt/IRttCallback;->onRangingFailure(I)V
 Landroid/net/wifi/rtt/IRttCallback;->onRangingResults(Ljava/util/List;)V
 Landroid/net/wifi/rtt/IWifiRttManager$Default;-><init>()V
 Landroid/net/wifi/rtt/IWifiRttManager$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/IWifiRttManager$Default;->cancelRanging(Landroid/os/WorkSource;)V
 Landroid/net/wifi/rtt/IWifiRttManager$Default;->isAvailable()Z
-Landroid/net/wifi/rtt/IWifiRttManager$Default;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;)V
+Landroid/net/wifi/rtt/IWifiRttManager$Default;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;Landroid/os/Bundle;)V
 Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->cancelRanging(Landroid/os/WorkSource;)V
 Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
 Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->isAvailable()Z
 Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->sDefaultImpl:Landroid/net/wifi/rtt/IWifiRttManager;
-Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;)V
+Landroid/net/wifi/rtt/IWifiRttManager$Stub$Proxy;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;Landroid/os/Bundle;)V
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;-><init>()V
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;->DESCRIPTOR:Ljava/lang/String;
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;->TRANSACTION_cancelRanging:I
@@ -6758,12 +7746,10 @@
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;->TRANSACTION_startRanging:I
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/rtt/IWifiRttManager;
-Landroid/net/wifi/rtt/IWifiRttManager$Stub;->getDefaultImpl()Landroid/net/wifi/rtt/IWifiRttManager;
 Landroid/net/wifi/rtt/IWifiRttManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/net/wifi/rtt/IWifiRttManager$Stub;->setDefaultImpl(Landroid/net/wifi/rtt/IWifiRttManager;)Z
 Landroid/net/wifi/rtt/IWifiRttManager;->cancelRanging(Landroid/os/WorkSource;)V
 Landroid/net/wifi/rtt/IWifiRttManager;->isAvailable()Z
-Landroid/net/wifi/rtt/IWifiRttManager;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;)V
+Landroid/net/wifi/rtt/IWifiRttManager;->startRanging(Landroid/os/IBinder;Ljava/lang/String;Ljava/lang/String;Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Landroid/net/wifi/rtt/IRttCallback;Landroid/os/Bundle;)V
 Landroid/net/wifi/rtt/RangingRequest$1;-><init>()V
 Landroid/net/wifi/rtt/RangingRequest$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/rtt/RangingRequest;
 Landroid/net/wifi/rtt/RangingRequest$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -6774,7 +7760,8 @@
 Landroid/net/wifi/rtt/RangingRequest$Builder;->addAccessPoints(Ljava/util/List;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest$Builder;->addNon80211mcCapableAccessPoint(Landroid/net/wifi/ScanResult;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest$Builder;->addNon80211mcCapableAccessPoints(Ljava/util/List;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,system-api,test-api
-Landroid/net/wifi/rtt/RangingRequest$Builder;->addResponder(Landroid/net/wifi/rtt/ResponderConfig;)Landroid/net/wifi/rtt/RangingRequest$Builder;,system-api,test-api
+Landroid/net/wifi/rtt/RangingRequest$Builder;->addResponder(Landroid/net/wifi/rtt/ResponderConfig;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/rtt/RangingRequest$Builder;->addResponders(Ljava/util/List;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest$Builder;->addWifiAwarePeer(Landroid/net/MacAddress;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest$Builder;->addWifiAwarePeer(Landroid/net/wifi/aware/PeerHandle;)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest$Builder;->build()Landroid/net/wifi/rtt/RangingRequest;,public-api,system-api,test-api
@@ -6783,7 +7770,7 @@
 Landroid/net/wifi/rtt/RangingRequest$Builder;->setRttBurstSize(I)Landroid/net/wifi/rtt/RangingRequest$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest;-><clinit>()V
 Landroid/net/wifi/rtt/RangingRequest;-><init>(Ljava/util/List;I)V
-Landroid/net/wifi/rtt/RangingRequest;-><init>(Ljava/util/List;ILandroid/net/wifi/rtt/RangingRequest$1;)V
+Landroid/net/wifi/rtt/RangingRequest;-><init>(Ljava/util/List;ILandroid/net/wifi/rtt/RangingRequest-IA;)V
 Landroid/net/wifi/rtt/RangingRequest;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/RangingRequest;->DEFAULT_RTT_BURST_SIZE:I
 Landroid/net/wifi/rtt/RangingRequest;->MAX_PEERS:I
@@ -6858,6 +7845,23 @@
 Landroid/net/wifi/rtt/ResponderConfig$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig$1;->newArray(I)[Landroid/net/wifi/rtt/ResponderConfig;
 Landroid/net/wifi/rtt/ResponderConfig$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;-><init>()V,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->build()Landroid/net/wifi/rtt/ResponderConfig;,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mCenterFreq0:I
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mCenterFreq1:I
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mChannelWidth:I
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mFrequency:I
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mMacAddress:Landroid/net/MacAddress;
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mPreamble:I
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mResponderType:I
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->mSupports80211Mc:Z
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->set80211mcSupported(Z)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->setCenterFreq0Mhz(I)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->setCenterFreq1Mhz(I)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->setChannelWidth(I)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->setFrequencyMhz(I)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->setMacAddress(Landroid/net/MacAddress;)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig$Builder;->setPreamble(I)Landroid/net/wifi/rtt/ResponderConfig$Builder;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;-><clinit>()V
 Landroid/net/wifi/rtt/ResponderConfig;-><init>(Landroid/net/MacAddress;IZIIIII)V,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;-><init>(Landroid/net/MacAddress;Landroid/net/wifi/aware/PeerHandle;IZIIIII)V
@@ -6865,10 +7869,12 @@
 Landroid/net/wifi/rtt/ResponderConfig;->AWARE_BAND_2_DISCOVERY_CHANNEL:I
 Landroid/net/wifi/rtt/ResponderConfig;->CHANNEL_WIDTH_160MHZ:I,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->CHANNEL_WIDTH_20MHZ:I,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->CHANNEL_WIDTH_320MHZ:I,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->CHANNEL_WIDTH_40MHZ:I,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->CHANNEL_WIDTH_80MHZ:I,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->CHANNEL_WIDTH_80MHZ_PLUS_MHZ:I,system-api,test-api
-Landroid/net/wifi/rtt/ResponderConfig;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->PREAMBLE_EHT:I,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->PREAMBLE_HE:I,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->PREAMBLE_HT:I,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->PREAMBLE_LEGACY:I,system-api,test-api
@@ -6885,10 +7891,17 @@
 Landroid/net/wifi/rtt/ResponderConfig;->describeContents()I,public-api,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->frequency:I,system-api,test-api
-Landroid/net/wifi/rtt/ResponderConfig;->fromScanResult(Landroid/net/wifi/ScanResult;)Landroid/net/wifi/rtt/ResponderConfig;,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->fromScanResult(Landroid/net/wifi/ScanResult;)Landroid/net/wifi/rtt/ResponderConfig;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->fromWifiAwarePeerHandleWithDefaults(Landroid/net/wifi/aware/PeerHandle;)Landroid/net/wifi/rtt/ResponderConfig;,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->fromWifiAwarePeerMacAddressWithDefaults(Landroid/net/MacAddress;)Landroid/net/wifi/rtt/ResponderConfig;,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->getCenterFreq0Mhz()I,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->getCenterFreq1Mhz()I,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->getChannelWidth()I,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->getFrequencyMhz()I,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->getMacAddress()Landroid/net/MacAddress;,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->getPreamble()I,public-api,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/rtt/ResponderConfig;->is80211mcSupported()Z,public-api,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->isValid(Z)Z
 Landroid/net/wifi/rtt/ResponderConfig;->macAddress:Landroid/net/MacAddress;,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->peerHandle:Landroid/net/wifi/aware/PeerHandle;,system-api,test-api
@@ -6896,7 +7909,10 @@
 Landroid/net/wifi/rtt/ResponderConfig;->responderType:I,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->supports80211mc:Z,system-api,test-api
 Landroid/net/wifi/rtt/ResponderConfig;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/rtt/ResponderConfig;->translateScanResultChannelWidth(I)I
+Landroid/net/wifi/rtt/ResponderConfig;->translateFromLocalToScanResultChannelWidth(I)I
+Landroid/net/wifi/rtt/ResponderConfig;->translateFromLocalToScanResultPreamble(I)I
+Landroid/net/wifi/rtt/ResponderConfig;->translateFromScanResultToLocalChannelWidth(I)I
+Landroid/net/wifi/rtt/ResponderConfig;->translateFromScanResultToLocalPreamble(I)I
 Landroid/net/wifi/rtt/ResponderConfig;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/net/wifi/rtt/ResponderLocation$1;-><init>()V
 Landroid/net/wifi/rtt/ResponderLocation$1;->createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/rtt/ResponderLocation;
@@ -6905,7 +7921,7 @@
 Landroid/net/wifi/rtt/ResponderLocation$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/ResponderLocation;-><clinit>()V
 Landroid/net/wifi/rtt/ResponderLocation;-><init>(Landroid/os/Parcel;)V
-Landroid/net/wifi/rtt/ResponderLocation;-><init>(Landroid/os/Parcel;Landroid/net/wifi/rtt/ResponderLocation$1;)V
+Landroid/net/wifi/rtt/ResponderLocation;-><init>(Landroid/os/Parcel;Landroid/net/wifi/rtt/ResponderLocation-IA;)V
 Landroid/net/wifi/rtt/ResponderLocation;-><init>([B[B)V
 Landroid/net/wifi/rtt/ResponderLocation;->ALTITUDE_FLOORS:I,public-api,system-api,test-api
 Landroid/net/wifi/rtt/ResponderLocation;->ALTITUDE_FRACTION_BITS:I
@@ -7073,13 +8089,13 @@
 Landroid/net/wifi/rtt/ResponderLocation;->toCivicLocationSparseArray()Landroid/util/SparseArray;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/ResponderLocation;->toLocation()Landroid/location/Location;,public-api,system-api,test-api
 Landroid/net/wifi/rtt/ResponderLocation;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/rtt/RangingResultCallback;I)V
+Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda0;-><init>(Landroid/net/wifi/rtt/RangingResultCallback;Ljava/util/List;)V
 Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda0;->f$0:Landroid/net/wifi/rtt/RangingResultCallback;
-Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda0;->f$1:I
+Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda0;->f$1:Ljava/util/List;
 Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/rtt/RangingResultCallback;Ljava/util/List;)V
+Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda1;-><init>(Landroid/net/wifi/rtt/RangingResultCallback;I)V
 Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda1;->f$0:Landroid/net/wifi/rtt/RangingResultCallback;
-Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda1;->f$1:Ljava/util/List;
+Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda1;->f$1:I
 Landroid/net/wifi/rtt/WifiRttManager$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/net/wifi/rtt/WifiRttManager$1;-><init>(Landroid/net/wifi/rtt/WifiRttManager;Ljava/util/concurrent/Executor;Landroid/net/wifi/rtt/RangingResultCallback;)V
 Landroid/net/wifi/rtt/WifiRttManager$1;->lambda$onRangingFailure$0(Landroid/net/wifi/rtt/RangingResultCallback;I)V
@@ -7099,6 +8115,15 @@
 Landroid/net/wifi/rtt/WifiRttManager;->mService:Landroid/net/wifi/rtt/IWifiRttManager;
 Landroid/net/wifi/rtt/WifiRttManager;->startRanging(Landroid/net/wifi/rtt/RangingRequest;Ljava/util/concurrent/Executor;Landroid/net/wifi/rtt/RangingResultCallback;)V,public-api,system-api,test-api
 Landroid/net/wifi/rtt/WifiRttManager;->startRanging(Landroid/os/WorkSource;Landroid/net/wifi/rtt/RangingRequest;Ljava/util/concurrent/Executor;Landroid/net/wifi/rtt/RangingResultCallback;)V,system-api,test-api
+Landroid/net/wifi/util/Environment;-><clinit>()V
+Landroid/net/wifi/util/Environment;-><init>()V
+Landroid/net/wifi/util/Environment;->TAG:Ljava/lang/String;
+Landroid/net/wifi/util/Environment;->WIFI_APEX_NAME:Ljava/lang/String;
+Landroid/net/wifi/util/Environment;->WIFI_APEX_PATH:Ljava/lang/String;
+Landroid/net/wifi/util/Environment;->getWifiSharedDirectory()Ljava/io/File;
+Landroid/net/wifi/util/Environment;->getWifiUserDirectory(I)Ljava/io/File;
+Landroid/net/wifi/util/Environment;->isAppInWifiApex(Landroid/content/pm/ApplicationInfo;)Z
+Landroid/net/wifi/util/Environment;->isVndkApiLevelNewerThan(I)Z
 Landroid/net/wifi/util/HexEncoding;-><clinit>()V
 Landroid/net/wifi/util/HexEncoding;-><init>()V
 Landroid/net/wifi/util/HexEncoding;->LOWER_CASE_DIGITS:[C
@@ -7115,93 +8140,512 @@
 Landroid/net/wifi/util/HexEncoding;->encodeToString([B)Ljava/lang/String;
 Landroid/net/wifi/util/HexEncoding;->encodeToString([BZ)Ljava/lang/String;
 Landroid/net/wifi/util/HexEncoding;->toDigit([CI)I
+Landroid/net/wifi/util/ScanResultUtil;-><init>()V
+Landroid/net/wifi/util/ScanResultUtil;->TAG:Ljava/lang/String;
+Landroid/net/wifi/util/ScanResultUtil;->createNetworkFromScanResult(Landroid/net/wifi/ScanResult;)Landroid/net/wifi/WifiConfiguration;
+Landroid/net/wifi/util/ScanResultUtil;->createQuotedSsid(Ljava/lang/String;)Ljava/lang/String;
+Landroid/net/wifi/util/ScanResultUtil;->dumpScanResults(Ljava/io/PrintWriter;Ljava/util/List;J)V
+Landroid/net/wifi/util/ScanResultUtil;->generateSecurityParamsListFromScanResult(Landroid/net/wifi/ScanResult;)Ljava/util/List;
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForDppNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForEapNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForEapSuiteBNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForFilsSha256Network(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForFilsSha384Network(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForOpenNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForOweNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForOweTransitionNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForPasspointR1R2Network(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForPasspointR3Network(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForPmfCapableNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForPmfMandatoryNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForPskNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForPskSaeTransitionNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForSaeNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForUnknownAkmNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForWapiCertNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForWapiPskNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForWepNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForWpa3EnterpriseOnlyNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->isScanResultForWpa3EnterpriseTransitionNetwork(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->redactBssid(Landroid/net/MacAddress;I)Ljava/lang/String;
+Landroid/net/wifi/util/ScanResultUtil;->validate(Landroid/net/wifi/ScanResult;)Z
+Landroid/net/wifi/util/ScanResultUtil;->validateScanResultList(Ljava/util/List;)Z
 Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants$NanParamSizeLimits;-><init>(Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants;)V
 Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants$NanParamSizeLimits;->MAX_PASSPHRASE_LENGTH:I
 Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants$NanParamSizeLimits;->MIN_PASSPHRASE_LENGTH:I
 Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants$NanParamSizeLimits;->this$0:Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants;
 Lcom/android/wifi/x/android/hardware/wifi/V1_0/Constants;-><init>()V
-Lcom/android/wifi/x/android/os/HandlerExecutor;-><init>(Landroid/os/Handler;)V
-Lcom/android/wifi/x/android/os/HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
-Lcom/android/wifi/x/android/os/HandlerExecutor;->mHandler:Landroid/os/Handler;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/AdbProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->apk_verity_mode()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->apk_verity_mode(Ljava/lang/Integer;)V
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/ApkVerityProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$$ExternalSyntheticLambda0;-><init>()V
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->$VALUES:[Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;-><clinit>()V
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->DISABLED:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->EMPTY:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->FILTERED:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->FULL:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->getPropValue()Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->propValue:Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->valueOf(Ljava/lang/String;)Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;->values()[Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->$VALUES:[Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;-><clinit>()V
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->DISABLED:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->EMPTY:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->FILTERED:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->FULL:Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->getPropValue()Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->propValue:Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->valueOf(Ljava/lang/String;)Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;->values()[Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->factory_reset()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->factory_reset(Ljava/lang/Boolean;)V
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->getClassOfDevice()Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->getDefaultDeviceName()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->getHardwareIdleCurrentMa()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->getHardwareOperatingVoltageMv()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->getHardwareRxCurrentMa()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->getHardwareTxCurrentMa()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isAdapterAddressValidationEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isGapLePrivacyEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileA2dpSinkEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileA2dpSourceEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileAshaCentralEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileAvrcpControllerEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileAvrcpTargetEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileBapBroadcastAssistEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileBapBroadcastSourceEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileBapUnicastClientEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileBasClientEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileBassClientEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileCcpServerEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileCsipSetCoordinatorEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileGattEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileHapClientEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileHfpAgEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileHfpHfEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileHidDeviceEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileHidHostEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileMapClientEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileMapServerEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileMcpServerEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileOppEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfilePanNapEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfilePanPanuEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfilePbapClientEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfilePbapServerEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileSapServerEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isProfileVcpControllerEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->isSupportPersistedStateEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->lambda$getClassOfDevice$0(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->snoop_default_mode()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->snoop_default_mode(Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_default_mode_values;)V
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->snoop_log_mode()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->snoop_log_mode(Lcom/android/wifi/x/android/sysprop/BluetoothProperties$snoop_log_mode_values;)V
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/BluetoothProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/CarProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/CarProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/CarProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/ContactsProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/CryptoProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->media_performance_class()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/DeviceProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/DisplayProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/HdmiProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->hypervisor_protected_vm_supported()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->hypervisor_version()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->hypervisor_vm_supported()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/HypervisorProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/InputProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/InputProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/InputProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->codec2_dmabuf_padding()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->resolution_limit_32bit()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->swcodec_ion_align()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->swcodec_ion_flags()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->swcodec_ion_heapmask()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/MediaProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->isCellular464XlatEnabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tcp_init_rwnd()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tcp_init_rwnd(Ljava/lang/Integer;)V
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/NetworkProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->ab_ota_partitions()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->virtual_ab_enabled()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->virtual_ab_retrofit()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->warm_reset()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/OtaProperties;->warm_reset(Ljava/lang/Boolean;)V
+Lcom/android/wifi/x/android/sysprop/PowerProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->fixed_performance_scale_factor()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/PowerProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/SetupWizardProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/SocProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/SocProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->soc_manufacturer()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->soc_model()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/SocProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties$$ExternalSyntheticLambda0;-><init>()V
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->call_ring_delay()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->disable_call()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->ecm_exit_timer()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->ignore_nitz()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->in_ecm_mode()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->in_ecm_mode(Ljava/lang/Boolean;)V
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->lambda$operator_iso_country$0(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->max_active_modems()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->mobile_data()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->multi_sim_config()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->multi_sim_config(Ljava/lang/String;)V
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->operator_idp_string()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->operator_idp_string(Ljava/lang/String;)V
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->operator_iso_country()Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->operator_iso_country(Ljava/util/List;)V
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->reset_on_radio_tech_change()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->ril_sends_multiple_call_ring()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->sim_slots_count()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->test_csim()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/TelephonyProperties;->wake_lock_timeout()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/TraceProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->product_vndk_version()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/VndkProperties;->vendor_vndk_version()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/VoldProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;-><init>()V
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->escape(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->formatEnumList(Ljava/util/List;Ljava/util/function/Function;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->formatList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->formatUIntList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->formatULongList(Ljava/util/List;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->start_supplicant()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->start_supplicant(Ljava/lang/Boolean;)V
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->stop_supplicant()Ljava/util/Optional;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->stop_supplicant(Ljava/lang/Boolean;)V
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseBoolean(Ljava/lang/String;)Ljava/lang/Boolean;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseDouble(Ljava/lang/String;)Ljava/lang/Double;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseEnum(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseEnumList(Ljava/lang/Class;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseInteger(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseList(Ljava/util/function/Function;Ljava/lang/String;)Ljava/util/List;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseLong(Ljava/lang/String;)Ljava/lang/Long;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseString(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseUInt(Ljava/lang/String;)Ljava/lang/Integer;
+Lcom/android/wifi/x/android/sysprop/WifiProperties;->tryParseULong(Ljava/lang/String;)Ljava/lang/Long;
 Lcom/android/wifi/x/android/telephony/Annotation;-><init>()V
-Lcom/android/wifi/x/androidx/annotation/CheckResult;->suggest()Ljava/lang/String;
-Lcom/android/wifi/x/androidx/annotation/ChecksSdkIntAtLeast;->api()I
-Lcom/android/wifi/x/androidx/annotation/ChecksSdkIntAtLeast;->codename()Ljava/lang/String;
-Lcom/android/wifi/x/androidx/annotation/ChecksSdkIntAtLeast;->lambda()I
-Lcom/android/wifi/x/androidx/annotation/ChecksSdkIntAtLeast;->parameter()I
-Lcom/android/wifi/x/androidx/annotation/Dimension;->DP:I
-Lcom/android/wifi/x/androidx/annotation/Dimension;->PX:I
-Lcom/android/wifi/x/androidx/annotation/Dimension;->SP:I
-Lcom/android/wifi/x/androidx/annotation/Dimension;->unit()I
-Lcom/android/wifi/x/androidx/annotation/FloatRange;->from()D
-Lcom/android/wifi/x/androidx/annotation/FloatRange;->fromInclusive()Z
-Lcom/android/wifi/x/androidx/annotation/FloatRange;->to()D
-Lcom/android/wifi/x/androidx/annotation/FloatRange;->toInclusive()Z
-Lcom/android/wifi/x/androidx/annotation/GuardedBy;->value()Ljava/lang/String;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$EnumEntry;->name()Ljava/lang/String;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$EnumEntry;->value()I
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$FlagEntry;->mask()I
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$FlagEntry;->name()Ljava/lang/String;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$FlagEntry;->target()I
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->$VALUES:[Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;-><clinit>()V
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;-><init>(Ljava/lang/String;I)V
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->COLOR:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->GRAVITY:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->INFERRED:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->INT_ENUM:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->INT_FLAG:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->NONE:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->RESOURCE_ID:Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->valueOf(Ljava/lang/String;)Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;->values()[Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty;->attributeId()I
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty;->enumMapping()[Lcom/android/wifi/x/androidx/annotation/InspectableProperty$EnumEntry;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty;->flagMapping()[Lcom/android/wifi/x/androidx/annotation/InspectableProperty$FlagEntry;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty;->hasAttributeId()Z
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty;->name()Ljava/lang/String;
-Lcom/android/wifi/x/androidx/annotation/InspectableProperty;->valueType()Lcom/android/wifi/x/androidx/annotation/InspectableProperty$ValueType;
-Lcom/android/wifi/x/androidx/annotation/IntDef;->flag()Z
-Lcom/android/wifi/x/androidx/annotation/IntDef;->open()Z
-Lcom/android/wifi/x/androidx/annotation/IntDef;->value()[I
-Lcom/android/wifi/x/androidx/annotation/IntRange;->from()J
-Lcom/android/wifi/x/androidx/annotation/IntRange;->to()J
-Lcom/android/wifi/x/androidx/annotation/LongDef;->flag()Z
-Lcom/android/wifi/x/androidx/annotation/LongDef;->open()Z
-Lcom/android/wifi/x/androidx/annotation/LongDef;->value()[J
-Lcom/android/wifi/x/androidx/annotation/RequiresApi;->api()I
-Lcom/android/wifi/x/androidx/annotation/RequiresApi;->value()I
-Lcom/android/wifi/x/androidx/annotation/RequiresFeature;->enforcement()Ljava/lang/String;
-Lcom/android/wifi/x/androidx/annotation/RequiresFeature;->name()Ljava/lang/String;
-Lcom/android/wifi/x/androidx/annotation/RequiresPermission$Read;->value()Lcom/android/wifi/x/androidx/annotation/RequiresPermission;
-Lcom/android/wifi/x/androidx/annotation/RequiresPermission$Write;->value()Lcom/android/wifi/x/androidx/annotation/RequiresPermission;
-Lcom/android/wifi/x/androidx/annotation/RequiresPermission;->allOf()[Ljava/lang/String;
-Lcom/android/wifi/x/androidx/annotation/RequiresPermission;->anyOf()[Ljava/lang/String;
-Lcom/android/wifi/x/androidx/annotation/RequiresPermission;->conditional()Z
-Lcom/android/wifi/x/androidx/annotation/RequiresPermission;->value()Ljava/lang/String;
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->$VALUES:[Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;-><clinit>()V
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;-><init>(Ljava/lang/String;I)V
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->GROUP_ID:Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->LIBRARY:Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->SUBCLASSES:Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->TESTS:Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->valueOf(Ljava/lang/String;)Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;
-Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;->values()[Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;
-Lcom/android/wifi/x/androidx/annotation/RestrictTo;->value()[Lcom/android/wifi/x/androidx/annotation/RestrictTo$Scope;
-Lcom/android/wifi/x/androidx/annotation/Size;->max()J
-Lcom/android/wifi/x/androidx/annotation/Size;->min()J
-Lcom/android/wifi/x/androidx/annotation/Size;->multiple()J
-Lcom/android/wifi/x/androidx/annotation/Size;->value()J
-Lcom/android/wifi/x/androidx/annotation/StringDef;->open()Z
-Lcom/android/wifi/x/androidx/annotation/StringDef;->value()[Ljava/lang/String;
-Lcom/android/wifi/x/androidx/annotation/VisibleForTesting;->NONE:I
-Lcom/android/wifi/x/androidx/annotation/VisibleForTesting;->PACKAGE_PRIVATE:I
-Lcom/android/wifi/x/androidx/annotation/VisibleForTesting;->PRIVATE:I
-Lcom/android/wifi/x/androidx/annotation/VisibleForTesting;->PROTECTED:I
-Lcom/android/wifi/x/androidx/annotation/VisibleForTesting;->otherwise()I
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$1ConnectAsync;-><init>(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;Landroid/content/Context;Landroid/os/Handler;Ljava/lang/String;Ljava/lang/String;)V
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$1ConnectAsync;->mDstClassName:Ljava/lang/String;
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$1ConnectAsync;->mDstPackageName:Ljava/lang/String;
@@ -7216,18 +8660,18 @@
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$DeathMonitor;-><init>(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;)V
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$DeathMonitor;->binderDied()V,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$DeathMonitor;->this$0:Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->-$$Nest$fgetmLockObject(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;)Ljava/lang/Object;
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->-$$Nest$fgetmResultMsg(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;)Landroid/os/Message;
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->-$$Nest$fputmResultMsg(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;Landroid/os/Message;)V
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;-><init>(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;Landroid/os/Looper;)V
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;-><init>(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;Landroid/os/Looper;Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$1;)V
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->access$300(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;)Ljava/lang/Object;
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->access$400(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;)Landroid/os/Message;
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->access$402(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;Landroid/os/Message;)Landroid/os/Message;
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;-><init>(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;Landroid/os/Looper;Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler-IA;)V
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->handleMessage(Landroid/os/Message;)V,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->mLockObject:Ljava/lang/Object;
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->mResultMsg:Landroid/os/Message;
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;->this$0:Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->-$$Nest$smsendMessageSynchronously(Landroid/os/Messenger;Landroid/os/Message;)Landroid/os/Message;
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;-><clinit>()V
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;-><init>()V
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->access$100(Landroid/os/Messenger;Landroid/os/Message;)Landroid/os/Message;
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->mHandler:Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger$SyncHandler;
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->mHandlerThread:Landroid/os/HandlerThread;
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->mMessenger:Landroid/os/Messenger;
@@ -7236,6 +8680,9 @@
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->sCount:I
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->sStack:Ljava/util/Stack;
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel$SyncMessenger;->sendMessageSynchronously(Landroid/os/Messenger;Landroid/os/Message;)Landroid/os/Message;
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->-$$Nest$fputmDstMessenger(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;Landroid/os/Messenger;)V
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->-$$Nest$mreplyDisconnected(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;I)V
+Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->-$$Nest$mreplyHalfConnected(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;I)V
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;-><clinit>()V
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;-><init>()V
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->BASE:I
@@ -7252,9 +8699,6 @@
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->STATUS_SEND_UNSUCCESSFUL:I
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->STATUS_SUCCESSFUL:I
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->TAG:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->access$000(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;I)V
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->access$502(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;Landroid/os/Messenger;)Landroid/os/Messenger;
-Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->access$600(Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;I)V
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->cmdToString(I)Ljava/lang/String;
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->connect(Landroid/content/Context;Landroid/os/Handler;Landroid/os/Handler;)V
 Lcom/android/wifi/x/com/android/internal/util/AsyncChannel;->connect(Landroid/content/Context;Landroid/os/Handler;Landroid/os/Messenger;)V
@@ -7314,6 +8758,12 @@
 Lcom/android/wifi/x/com/android/internal/util/AsyncService;->onCreate()V,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/internal/util/AsyncService;->onDestroy()V,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/internal/util/AsyncService;->onStartCommand(Landroid/content/Intent;II)I,public-api,system-api,test-api
+Lcom/android/wifi/x/com/android/internal/util/IState;->HANDLED:Z
+Lcom/android/wifi/x/com/android/internal/util/IState;->NOT_HANDLED:Z
+Lcom/android/wifi/x/com/android/internal/util/IState;->enter()V
+Lcom/android/wifi/x/com/android/internal/util/IState;->exit()V
+Lcom/android/wifi/x/com/android/internal/util/IState;->getName()Ljava/lang/String;
+Lcom/android/wifi/x/com/android/internal/util/IState;->processMessage(Landroid/os/Message;)Z
 Lcom/android/wifi/x/com/android/internal/util/Preconditions;-><init>()V
 Lcom/android/wifi/x/com/android/internal/util/Preconditions;->checkArgument(Z)V
 Lcom/android/wifi/x/com/android/internal/util/Preconditions;->checkArgument(ZLjava/lang/Object;)V
@@ -7379,23 +8829,233 @@
 Lcom/android/wifi/x/com/android/internal/util/Protocol;->BASE_WIFI_SCANNER_SERVICE:I
 Lcom/android/wifi/x/com/android/internal/util/Protocol;->BASE_WIFI_WATCHDOG:I
 Lcom/android/wifi/x/com/android/internal/util/Protocol;->MAX_MESSAGE:I
+Lcom/android/wifi/x/com/android/internal/util/State;-><init>()V
+Lcom/android/wifi/x/com/android/internal/util/State;->enter()V
+Lcom/android/wifi/x/com/android/internal/util/State;->exit()V
+Lcom/android/wifi/x/com/android/internal/util/State;->getName()Ljava/lang/String;
+Lcom/android/wifi/x/com/android/internal/util/State;->processMessage(Landroid/os/Message;)Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine;Landroid/os/Message;Ljava/lang/String;Lcom/android/wifi/x/com/android/internal/util/IState;Lcom/android/wifi/x/com/android/internal/util/IState;Lcom/android/wifi/x/com/android/internal/util/IState;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->getDestState()Lcom/android/wifi/x/com/android/internal/util/IState;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->getInfo()Ljava/lang/String;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->getOriginalState()Lcom/android/wifi/x/com/android/internal/util/IState;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->getState()Lcom/android/wifi/x/com/android/internal/util/IState;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->getTime()J
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->getWhat()J
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mDstState:Lcom/android/wifi/x/com/android/internal/util/IState;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mInfo:Ljava/lang/String;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mOrgState:Lcom/android/wifi/x/com/android/internal/util/IState;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mSm:Lcom/android/wifi/x/com/android/internal/util/StateMachine;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mState:Lcom/android/wifi/x/com/android/internal/util/IState;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mTime:J
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->mWhat:I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;->update(Lcom/android/wifi/x/com/android/internal/util/StateMachine;Landroid/os/Message;Ljava/lang/String;Lcom/android/wifi/x/com/android/internal/util/IState;Lcom/android/wifi/x/com/android/internal/util/IState;Lcom/android/wifi/x/com/android/internal/util/IState;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->-$$Nest$fgetmLogRecVector(Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;)Ljava/util/Vector;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->-$$Nest$fgetmMaxSize(Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;)I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;-><init>()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords-IA;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->DEFAULT_SIZE:I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->add(Lcom/android/wifi/x/com/android/internal/util/StateMachine;Landroid/os/Message;Ljava/lang/String;Lcom/android/wifi/x/com/android/internal/util/IState;Lcom/android/wifi/x/com/android/internal/util/IState;Lcom/android/wifi/x/com/android/internal/util/IState;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->cleanup()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->count()I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->get(I)Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->logOnlyTransitions()Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->mCount:I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->mLogOnlyTransitions:Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->mLogRecVector:Ljava/util/Vector;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->mMaxSize:I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->mOldestIndex:I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->setLogOnlyTransitions(Z)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->setSize(I)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;->size()I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$$ExternalSyntheticLambda0;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$$ExternalSyntheticLambda0;->f$0:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState-IA;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState;->processMessage(Landroid/os/Message;)Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState;->this$0:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$QuittingState;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$QuittingState;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$QuittingState-IA;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$QuittingState;->processMessage(Landroid/os/Message;)Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$QuittingState;->this$0:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;-><init>(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo-IA;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;->active:Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;->parentStateInfo:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;->state:Lcom/android/wifi/x/com/android/internal/util/State;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;->this$0:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmDbg(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmDeferredMessages(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Ljava/util/ArrayList;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmDestState(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Lcom/android/wifi/x/com/android/internal/util/State;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmHaltingState(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmLogRecords(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmSm(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Lcom/android/wifi/x/com/android/internal/util/StateMachine;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmStateStack(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)[Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$fgetmStateStackTopIndex(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$maddState(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/State;Lcom/android/wifi/x/com/android/internal/util/State;)Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mcompleteConstruction(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mdeferMessage(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Landroid/os/Message;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mgetCurrentMessage(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Landroid/os/Message;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mgetCurrentState(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Lcom/android/wifi/x/com/android/internal/util/IState;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$misDbg(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$misQuit(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Landroid/os/Message;)Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mquit(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mquitNow(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mremoveState(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/State;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$msetDbg(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Z)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$msetInitialState(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/State;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->-$$Nest$mtransitionTo(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;Lcom/android/wifi/x/com/android/internal/util/IState;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;-><clinit>()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;-><init>(Landroid/os/Looper;Lcom/android/wifi/x/com/android/internal/util/StateMachine;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;-><init>(Landroid/os/Looper;Lcom/android/wifi/x/com/android/internal/util/StateMachine;Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler-IA;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->addState(Lcom/android/wifi/x/com/android/internal/util/State;Lcom/android/wifi/x/com/android/internal/util/State;)Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->cleanupAfterQuitting()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->completeConstruction()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->deferMessage(Landroid/os/Message;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->getCurrentMessage()Landroid/os/Message;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->getCurrentState()Lcom/android/wifi/x/com/android/internal/util/IState;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->handleMessage(Landroid/os/Message;)V,public-api,system-api,test-api
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->invokeEnterMethods(I)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->invokeExitMethods(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->isDbg()Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->isQuit(Landroid/os/Message;)Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->lambda$removeState$0(Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;)Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mDbg:Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mDeferredMessages:Ljava/util/ArrayList;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mDestState:Lcom/android/wifi/x/com/android/internal/util/State;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mHaltingState:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$HaltingState;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mHasQuit:Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mInitialState:Lcom/android/wifi/x/com/android/internal/util/State;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mIsConstructionCompleted:Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mLogRecords:Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRecords;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mMsg:Landroid/os/Message;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mQuittingState:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$QuittingState;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mSm:Lcom/android/wifi/x/com/android/internal/util/StateMachine;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mSmHandlerObj:Ljava/lang/Object;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mStateInfo:Ljava/util/HashMap;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mStateStack:[Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mStateStackTopIndex:I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mTempStateStack:[Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mTempStateStackCount:I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->mTransitionInProgress:Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->moveDeferredMessageAtFrontOfQueue()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->moveTempStateStackToStateStack()I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->performTransitions(Lcom/android/wifi/x/com/android/internal/util/State;Landroid/os/Message;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->processMsg(Landroid/os/Message;)Lcom/android/wifi/x/com/android/internal/util/State;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->quit()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->quitNow()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->removeState(Lcom/android/wifi/x/com/android/internal/util/State;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->setDbg(Z)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->setInitialState(Lcom/android/wifi/x/com/android/internal/util/State;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->setupInitialStateStack()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->setupTempStateStackWithStatesToEnter(Lcom/android/wifi/x/com/android/internal/util/State;)Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler$StateInfo;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;->transitionTo(Lcom/android/wifi/x/com/android/internal/util/IState;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->-$$Nest$fgetmName(Lcom/android/wifi/x/com/android/internal/util/StateMachine;)Ljava/lang/String;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->-$$Nest$fgetmSmThread(Lcom/android/wifi/x/com/android/internal/util/StateMachine;)Landroid/os/HandlerThread;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->-$$Nest$fputmSmHandler(Lcom/android/wifi/x/com/android/internal/util/StateMachine;Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->-$$Nest$fputmSmThread(Lcom/android/wifi/x/com/android/internal/util/StateMachine;Landroid/os/HandlerThread;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;-><init>(Ljava/lang/String;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Handler;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->HANDLED:Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->NOT_HANDLED:Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->SM_INIT_CMD:I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->SM_QUIT_CMD:I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->addLogRec(Ljava/lang/String;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->addState(Lcom/android/wifi/x/com/android/internal/util/State;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->addState(Lcom/android/wifi/x/com/android/internal/util/State;Lcom/android/wifi/x/com/android/internal/util/State;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->copyLogRecs()Ljava/util/Collection;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->deferMessage(Landroid/os/Message;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getCurrentMessage()Landroid/os/Message;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getCurrentState()Lcom/android/wifi/x/com/android/internal/util/IState;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getHandler()Landroid/os/Handler;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getLogRec(I)Lcom/android/wifi/x/com/android/internal/util/StateMachine$LogRec;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getLogRecCount()I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getLogRecMaxSize()I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getLogRecSize()I
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getLogRecString(Landroid/os/Message;)Ljava/lang/String;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getName()Ljava/lang/String;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->getWhatToString(I)Ljava/lang/String;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->haltedProcessMessage(Landroid/os/Message;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->hasDeferredMessages(I)Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->hasMessages(I)Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->initStateMachine(Ljava/lang/String;Landroid/os/Looper;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->isDbg()Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->isQuit(Landroid/os/Message;)Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->log(Ljava/lang/String;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->logAndAddLogRec(Ljava/lang/String;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->logd(Ljava/lang/String;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->loge(Ljava/lang/String;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->loge(Ljava/lang/String;Ljava/lang/Throwable;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->logi(Ljava/lang/String;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->logv(Ljava/lang/String;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->logw(Ljava/lang/String;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->mName:Ljava/lang/String;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->mSmHandler:Lcom/android/wifi/x/com/android/internal/util/StateMachine$SmHandler;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->mSmThread:Landroid/os/HandlerThread;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->obtainMessage()Landroid/os/Message;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->obtainMessage(I)Landroid/os/Message;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->obtainMessage(II)Landroid/os/Message;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->obtainMessage(ILjava/lang/Object;)Landroid/os/Message;
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->onHalting()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->onPostHandleMessage(Landroid/os/Message;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->onPreHandleMessage(Landroid/os/Message;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->onQuitting()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->quit()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->quitNow()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->recordLogRec(Landroid/os/Message;)Z
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->removeDeferredMessages(I)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->removeMessages(I)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->removeState(Lcom/android/wifi/x/com/android/internal/util/State;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessage(I)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessage(II)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessage(III)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageAtFrontOfQueue(I)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageAtFrontOfQueue(II)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageAtFrontOfQueue(III)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageAtFrontOfQueue(IIILjava/lang/Object;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageAtFrontOfQueue(ILjava/lang/Object;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageAtFrontOfQueue(Landroid/os/Message;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageDelayed(IIIJ)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageDelayed(IIILjava/lang/Object;J)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageDelayed(IIJ)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageDelayed(IJ)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageDelayed(ILjava/lang/Object;J)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->sendMessageDelayed(Landroid/os/Message;J)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->setDbg(Z)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->setInitialState(Lcom/android/wifi/x/com/android/internal/util/State;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->setLogOnlyTransitions(Z)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->setLogRecSize(I)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->start()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->transitionTo(Lcom/android/wifi/x/com/android/internal/util/IState;)V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->transitionToHaltingState()V
+Lcom/android/wifi/x/com/android/internal/util/StateMachine;->unhandledMessage(Landroid/os/Message;)V
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice$1;-><init>(Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;ILjava/lang/Class;I)V
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice$1;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice$1;->this$0:Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice$1;->val$N:I
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice$1;->val$callFlags:I
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice$1;->val$listElementClass:Ljava/lang/Class;
+Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->-$$Nest$fgetmList(Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;)Ljava/util/List;
+Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->-$$Nest$sfgetDEBUG()Z
+Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->-$$Nest$sfgetMAX_IPC_SIZE()I
+Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->-$$Nest$sfgetTAG()Ljava/lang/String;
+Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->-$$Nest$smverifySameType(Ljava/lang/Class;Ljava/lang/Class;)V
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;-><clinit>()V
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;-><init>(Ljava/util/List;)V
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->DEBUG:Z
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->MAX_IPC_SIZE:I
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->TAG:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->access$000()Z
-Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->access$100()Ljava/lang/String;
-Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->access$200()I
-Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->access$300(Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;)Ljava/util/List;
-Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->access$400(Ljava/lang/Class;Ljava/lang/Class;)V
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->getList()Ljava/util/List;
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->mInlineCountLimit:I
 Lcom/android/wifi/x/com/android/modules/utils/BaseParceledListSlice;->mList:Ljava/util/List;
@@ -7445,6 +9105,9 @@
 Lcom/android/wifi/x/com/android/modules/utils/BasicShellCommandHandler;->onHelp()V
 Lcom/android/wifi/x/com/android/modules/utils/BasicShellCommandHandler;->peekNextArg()Ljava/lang/String;
 Lcom/android/wifi/x/com/android/modules/utils/BasicShellCommandHandler;->peekRemainingArgs()[Ljava/lang/String;
+Lcom/android/wifi/x/com/android/modules/utils/HandlerExecutor;-><init>(Landroid/os/Handler;)V
+Lcom/android/wifi/x/com/android/modules/utils/HandlerExecutor;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
+Lcom/android/wifi/x/com/android/modules/utils/HandlerExecutor;->mHandler:Landroid/os/Handler;
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice$1;-><init>()V
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice$1;->createFromParcel(Landroid/os/Parcel;)Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
@@ -7454,7 +9117,7 @@
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;-><clinit>()V
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V
-Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice$1;)V
+Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice-IA;)V
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;-><init>(Ljava/util/List;)V
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;->CREATOR:Landroid/os/Parcelable$ClassLoaderCreator;
 Lcom/android/wifi/x/com/android/modules/utils/ParceledListSlice;->describeContents()I,public-api,system-api,test-api
@@ -7476,7 +9139,7 @@
 Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;-><clinit>()V
 Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V
-Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice$1;)V
+Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;-><init>(Landroid/os/Parcel;Ljava/lang/ClassLoader;Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice-IA;)V
 Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;-><init>(Ljava/util/List;)V
 Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;->CREATOR:Landroid/os/Parcelable$ClassLoaderCreator;
 Lcom/android/wifi/x/com/android/modules/utils/StringParceledListSlice;->describeContents()I,public-api,system-api,test-api
@@ -7493,90 +9156,33 @@
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastPreReleaseCodename(Ljava/lang/String;)Z
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastR()Z
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastS()Z
+Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastSv2()Z
 Lcom/android/wifi/x/com/android/modules/utils/build/SdkLevel;->isAtLeastT()Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->all(Ljava/util/Collection;Ljava/util/function/Predicate;)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->any(Landroid/util/SparseArray;Ljava/util/function/Predicate;)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->any(Ljava/util/Collection;Ljava/util/function/Predicate;)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([II)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->filter(Ljava/util/Collection;Ljava/util/function/Predicate;)Ljava/util/ArrayList;
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->indexOf(Ljava/util/Collection;Ljava/util/function/Predicate;)I
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->indexOf([Ljava/lang/Object;Ljava/lang/Object;)I
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->isEmpty(Ljava/util/Collection;)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->isEmpty([Ljava/lang/Object;)Z
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->toIntArray(Ljava/util/Collection;)[I
-Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->toLongArray(Ljava/util/Collection;)[J
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_DEFAULT_MODE:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OFF:I
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OFF_STRING:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OPPORTUNISTIC:I
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_OPPORTUNISTIC_STRING:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_PROVIDER_HOSTNAME:I
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_MODE_PROVIDER_HOSTNAME_STRING:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->PRIVATE_DNS_SPECIFIER:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsHostname(Landroid/content/Context;)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsMode(Landroid/content/Context;)I
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsModeAsInt(Ljava/lang/String;)I
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->getPrivateDnsModeAsString(I)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->setPrivateDnsHostname(Landroid/content/Context;Ljava/lang/String;)V
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivitySettingsUtils;->setPrivateDnsMode(Landroid/content/Context;I)V
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;->addressAndPortToString(Ljava/net/InetAddress;I)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;->isIPv6ULA(Ljava/net/InetAddress;)Z
-Lcom/android/wifi/x/com/android/net/module/util/ConnectivityUtils;->saturatedCast(J)I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;-><init>(Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;Ljava/nio/ByteBuffer;)V
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->TAG:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->flags:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->getRecordCount(I)I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->id:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->mRecordCount:[I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->rcode:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;->this$0:Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;-><init>(Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;ILjava/nio/ByteBuffer;)V
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->MAXLABELCOUNT:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->MAXLABELSIZE:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->MAXNAMESIZE:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->NAME_COMPRESSION:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->NAME_NORMAL:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->TAG:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->dName:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->getRR()[B
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->labelToString([B)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->mByteFormat:Ljava/text/DecimalFormat;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->mPos:Ljava/text/FieldPosition;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->mRdata:[B
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->nsClass:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->nsType:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->parseName(Ljava/nio/ByteBuffer;I)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->this$0:Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsRecord;->ttl:J
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException;-><init>(Ljava/lang/String;)V
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$ParseException;->reason:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;-><clinit>()V
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;-><init>([B)V
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->ANSECTION:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->ARSECTION:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->NSSECTION:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->NUM_SECTIONS:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->QDSECTION:I
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->TAG:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->mHeader:Lcom/android/wifi/x/com/android/net/module/util/DnsPacket$DnsHeader;
-Lcom/android/wifi/x/com/android/net/module/util/DnsPacket;->mRecords:[Ljava/util/List;
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;-><clinit>()V
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;-><init>(ILjava/lang/String;Ljava/util/Set;)V
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->PREVIOUS_CODENAMES:Landroid/util/SparseArray;
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtLeast(Ljava/lang/String;)Z
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtLeastInternal(Ljava/lang/String;)Z
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtMost(Ljava/lang/String;)Z
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isAtMostInternal(Ljava/lang/String;)Z
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->isCodename(Ljava/lang/String;)Z
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mCodename:Ljava/lang/String;
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mIsReleaseBuild:Z
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mKnownCodenames:Ljava/util/Set;
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->mSdkInt:I
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->removeFingerprint(Ljava/lang/String;)Ljava/lang/String;
+Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;->sInstance:Lcom/android/wifi/x/com/android/modules/utils/build/UnboundedSdkLevel;
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;-><init>()V
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;->createFromParcel(Landroid/os/Parcel;)Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;->newArray(I)[Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;->-$$Nest$fgetmData(Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;)[B
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;-><clinit>()V
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;-><init>()V
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;-><init>(Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;)V
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;-><init>([B)V
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;->CREATOR:Landroid/os/Parcelable$Creator;
-Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;->access$000(Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;)[B
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;->contains(Ljava/lang/String;)Z
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;->describeContents()I,public-api,system-api,test-api
 Lcom/android/wifi/x/com/android/net/module/util/DnsSdTxtRecord;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
@@ -7612,76 +9218,9 @@
 Lcom/android/wifi/x/com/android/net/module/util/InetAddressUtils;->INET6_ADDR_LENGTH:I
 Lcom/android/wifi/x/com/android/net/module/util/InetAddressUtils;->parcelInetAddress(Landroid/os/Parcel;Ljava/net/InetAddress;I)V
 Lcom/android/wifi/x/com/android/net/module/util/InetAddressUtils;->unparcelInetAddress(Landroid/os/Parcel;)Ljava/net/InetAddress;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;-><init>(Landroid/net/IpPrefix;)V
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;-><init>(Ljava/net/InetAddress;Ljava/net/InetAddress;)V
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->SIGNUM_POSITIVE:I
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->addrToBigInteger([B)Ljava/math/BigInteger;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->asIpPrefixes()Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->containsRange(Lcom/android/wifi/x/com/android/net/module/util/IpRange;)Z
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getAsInetAddress([B)Ljava/net/InetAddress;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getEndAddr()Ljava/net/InetAddress;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getStartAddr()Ljava/net/InetAddress;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->getSubsetPrefixes(Landroid/net/IpPrefix;)Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->hashCode()I,core-platform-api,public-api,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->mEndAddr:[B
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->mStartAddr:[B
-Lcom/android/wifi/x/com/android/net/module/util/IpRange;->overlapsRange(Lcom/android/wifi/x/com/android/net/module/util/IpRange;)Z
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->addressAndPortToString(Ljava/net/InetAddress;I)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->checksum(Ljava/nio/ByteBuffer;III)I
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->icmpv6Checksum(Ljava/nio/ByteBuffer;III)S
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->intAbs(S)I
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->ipChecksum(Ljava/nio/ByteBuffer;I)S
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->ipversion(Ljava/nio/ByteBuffer;I)B
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->isValidUdpOrTcpPort(I)Z
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->pseudoChecksumIPv4(Ljava/nio/ByteBuffer;III)I
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->pseudoChecksumIPv6(Ljava/nio/ByteBuffer;III)I
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->tcpChecksum(Ljava/nio/ByteBuffer;III)S
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->transportChecksum(Ljava/nio/ByteBuffer;IIII)S
-Lcom/android/wifi/x/com/android/net/module/util/IpUtils;->udpChecksum(Ljava/nio/ByteBuffer;II)S
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;-><init>(Ljava/util/Collection;Ljava/util/Collection;Ljava/util/function/Function;)V
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->added:Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->removed:Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareOrUpdateResult;->updated:Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;-><init>(Ljava/util/Collection;Ljava/util/Collection;)V
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->added:Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->removed:Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->compareAddresses(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils$CompareResult;
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalAddresses(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalDnses(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalHttpProxy(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalInterfaceName(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LinkPropertiesUtils;->isIdenticalRoutes(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;-><init>(Landroid/content/Context;)V
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->ERROR_LOCATION_MODE_OFF:I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->ERROR_LOCATION_PERMISSION_MISSING:I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->SUCCEEDED:I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->TAG:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkCallersLocationPermission(Ljava/lang/String;Ljava/lang/String;IZLjava/lang/String;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkLocationPermission(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkLocationPermissionInternal(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkLocationPermissionWithDetailInfo(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkMainlineNetworkStackPermission(I)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkNetworkSettingsPermission(I)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkNetworkSetupWizardPermission(I)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkNetworkStackPermission(I)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->checkPackage(ILjava/lang/String;)V
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->enforceLocationPermission(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)V
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->getCurrentUser()I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->getUidPermission(Ljava/lang/String;I)I
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->isLocationModeEnabled()Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->isTargetSdkLessThan(Ljava/lang/String;II)Z
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->mAppOpsManager:Landroid/app/AppOpsManager;
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->mContext:Landroid/content/Context;
-Lcom/android/wifi/x/com/android/net/module/util/LocationPermissionChecker;->noteAppOpAllowed(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Z
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;-><clinit>()V
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->DEFAULT_MAC_ADDRESS:Ljava/lang/String;
+Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->DEFAULT_MAC_ADDRESS:Landroid/net/MacAddress;
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->ETHER_ADDR_LEN:I
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->LOCALLY_ASSIGNED_MASK:J
 Lcom/android/wifi/x/com/android/net/module/util/MacAddressUtils;->MULTICAST_MASK:J
@@ -7699,128 +9238,3 @@
 Lcom/android/wifi/x/com/android/net/module/util/NetUtils;->getNetworkPart(Ljava/net/InetAddress;I)Ljava/net/InetAddress;
 Lcom/android/wifi/x/com/android/net/module/util/NetUtils;->maskRawAddress([BI)V
 Lcom/android/wifi/x/com/android/net/module/util/NetUtils;->selectBestRoute(Ljava/util/Collection;Ljava/net/InetAddress;)Landroid/net/RouteInfo;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;-><clinit>()V
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->DISPLAY_TRANSPORT_PRIORITIES:[I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->FORCE_RESTRICTED_CAPABILITIES:J
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_BIP:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_ENTERPRISE:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_NOT_VCN_MANAGED:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_OEM_PRIVATE:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VEHICLE_INTERNAL:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VSIM:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->RESTRICTED_CAPABILITIES:J
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->UNRESTRICTED_CAPABILITIES:J
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->getDisplayTransport([I)I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->inferRestrictedCapability(Landroid/net/NetworkCapabilities;)Z
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->packBits([I)J
-Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->unpackBits(J)[I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkIdentityUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/NetworkIdentityUtils;->scrubSubscriberId(Ljava/lang/String;)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkIdentityUtils;->scrubSubscriberIds([Ljava/lang/String;)[Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;-><clinit>()V
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_ETHER_IPV4_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_HWTYPE_ETHER:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_HWTYPE_RESERVED_HI:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_HWTYPE_RESERVED_LO:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_PAYLOAD_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_REPLY:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ARP_REQUEST:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->DHCP4_CLIENT_PORT:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_ADDR_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_BROADCAST:[B
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_DST_ADDR_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_HEADER_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_MTU:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_SRC_ADDR_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_ARP:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_IPV4:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_IPV6:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_LENGTH:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ETHER_TYPE_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_CHECKSUM_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ECHO_REPLY_TYPE:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ECHO_REQUEST_TYPE:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_HEADER_MIN_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NA_HEADER_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_LENGTH_SCALING_FACTOR:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MIN_LENGTH:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MTU:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_PIO:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_PREF64:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_RDNSS:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_SLLA:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_TLLA:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_ADVERTISEMENT:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_SOLICITATION:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NS_HEADER_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_RA_HEADER_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ROUTER_ADVERTISEMENT:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ROUTER_SOLICITATION:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_RS_HEADER_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->INFINITE_LEASE:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_ALL:Ljava/net/Inet4Address;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_ANY:Ljava/net/Inet4Address;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_BITS:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_CONFLICT_ANNOUNCE_NUM:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_CONFLICT_PROBE_NUM:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_DST_ADDR_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_FLAGS_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_FRAGMENT_MASK:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_HEADER_MIN_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_IHL_MASK:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_MAX_MTU:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_MIN_MTU:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_PROTOCOL_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_SRC_ADDR_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ALL_HOSTS_MULTICAST:Ljava/net/Inet6Address;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ALL_NODES_MULTICAST:Ljava/net/Inet6Address;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ALL_ROUTERS_MULTICAST:Ljava/net/Inet6Address;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_ANY:Ljava/net/Inet6Address;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_ADDR_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_DST_ADDR_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_HEADER_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_LEN_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_MIN_MTU:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_PROTOCOL_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV6_SRC_ADDR_OFFSET:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->NEIGHBOR_ADVERTISEMENT_FLAG_ROUTER:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->NEIGHBOR_ADVERTISEMENT_FLAG_SOLICITED:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->PIO_FLAG_AUTONOMOUS:B
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->PIO_FLAG_ON_LINK:B
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ROUTER_ADVERTISEMENT_FLAG_MANAGED_ADDRESS:B
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ROUTER_ADVERTISEMENT_FLAG_OTHER:B
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_DHCP:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_DHCP_SERVER:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_DNS:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_NEIGHBOR:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->TAG_SYSTEM_PROBE:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->UDP_HEADER_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->VENDOR_SPECIFIC_IE_ID:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->makeInet4Address(BBBB)Ljava/net/Inet4Address;
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->makeInet6Address([B)Ljava/net/Inet6Address;
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->checkAnyPermissionOf(Landroid/content/Context;[Ljava/lang/String;)Z
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->enforceAnyPermissionOf(Landroid/content/Context;[Ljava/lang/String;)V
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->enforceNetworkStackPermission(Landroid/content/Context;)V
-Lcom/android/wifi/x/com/android/net/module/util/PermissionUtils;->enforceNetworkStackPermissionOr(Landroid/content/Context;[Ljava/lang/String;)V
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;-><clinit>()V
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;-><init>()V
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->EXCLLIST_PATTERN:Ljava/util/regex/Pattern;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->EXCLLIST_REGEXP:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->EXCL_REGEX:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->HOSTNAME_PATTERN:Ljava/util/regex/Pattern;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->HOSTNAME_REGEXP:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->NAME_IP_REGEX:Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_EXCLLIST_INVALID:I
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_HOSTNAME_EMPTY:I
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_HOSTNAME_INVALID:I
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_PORT_EMPTY:I
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_PORT_INVALID:I
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->PROXY_VALID:I
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->exclusionListAsString([Ljava/lang/String;)Ljava/lang/String;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->exclusionStringAsList(Ljava/lang/String;)Ljava/util/List;
-Lcom/android/wifi/x/com/android/net/module/util/ProxyUtils;->validate(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
diff --git a/current/licenses/build/soong/licenses/LICENSE b/current/licenses/build/soong/licenses/LICENSE
index dae0406..d645695 100644
--- a/current/licenses/build/soong/licenses/LICENSE
+++ b/current/licenses/build/soong/licenses/LICENSE
@@ -1,16 +1,4 @@
 
-   Copyright (c) The Android Open Source Project
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
diff --git a/current/sdk_library/module-lib/framework-wifi-stubs.jar b/current/sdk_library/module-lib/framework-wifi-stubs.jar
index fafe5b8..b906359 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 87ae981..16f363b 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.txt b/current/sdk_library/module-lib/framework-wifi.txt
index d802177..7027f25 100644
--- a/current/sdk_library/module-lib/framework-wifi.txt
+++ b/current/sdk_library/module-lib/framework-wifi.txt
@@ -1 +1,10 @@
 // Signature format: 2.0
+package android.net.wifi {
+
+  public class WifiManager {
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void addCustomDhcpOptions(@NonNull android.net.wifi.WifiSsid, @NonNull byte[], @NonNull java.util.List<android.net.DhcpOption>);
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void removeCustomDhcpOptions(@NonNull android.net.wifi.WifiSsid, @NonNull byte[]);
+  }
+
+}
+
diff --git a/current/sdk_library/public/framework-wifi-stubs.jar b/current/sdk_library/public/framework-wifi-stubs.jar
index 41bcc6d..0da9e12 100644
--- a/current/sdk_library/public/framework-wifi-stubs.jar
+++ b/current/sdk_library/public/framework-wifi-stubs.jar
Binary files differ
diff --git a/current/sdk_library/public/framework-wifi.srcjar b/current/sdk_library/public/framework-wifi.srcjar
index 71c6c71..07580d2 100644
--- a/current/sdk_library/public/framework-wifi.srcjar
+++ b/current/sdk_library/public/framework-wifi.srcjar
Binary files differ
diff --git a/current/sdk_library/public/framework-wifi.txt b/current/sdk_library/public/framework-wifi.txt
index c5d9c2f..f78a462 100644
--- a/current/sdk_library/public/framework-wifi.txt
+++ b/current/sdk_library/public/framework-wifi.txt
@@ -18,13 +18,36 @@
     field public static final int EASY_CONNECT_EVENT_FAILURE_URI_GENERATION = -13; // 0xfffffff3
   }
 
+  public final class MloLink implements android.os.Parcelable {
+    ctor public MloLink();
+    method public int describeContents();
+    method @Nullable public android.net.MacAddress getApMacAddress();
+    method public int getBand();
+    method @IntRange(from=1) public int getChannel();
+    method @IntRange(from=android.net.wifi.MloLink.INVALID_MLO_LINK_ID, to=0xf) public int getLinkId();
+    method @Nullable public android.net.MacAddress getStaMacAddress();
+    method public int getState();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.MloLink> CREATOR;
+    field public static final int INVALID_MLO_LINK_ID = -1; // 0xffffffff
+    field public static final int MLO_LINK_STATE_ACTIVE = 3; // 0x3
+    field public static final int MLO_LINK_STATE_IDLE = 2; // 0x2
+    field public static final int MLO_LINK_STATE_INVALID = 0; // 0x0
+    field public static final int MLO_LINK_STATE_UNASSOCIATED = 1; // 0x1
+  }
+
   public final class ScanResult implements android.os.Parcelable {
     ctor public ScanResult(@NonNull android.net.wifi.ScanResult);
     ctor public ScanResult();
     method public static int convertChannelToFrequencyMhzIfSupported(int, int);
     method public static int convertFrequencyMhzToChannelIfSupported(int);
     method public int describeContents();
+    method @NonNull public java.util.List<android.net.wifi.MloLink> getAffiliatedMloLinks();
+    method @Nullable public android.net.MacAddress getApMldMacAddress();
+    method @IntRange(from=android.net.wifi.MloLink.INVALID_MLO_LINK_ID, to=0xf) public int getApMloLinkId();
     method @NonNull public java.util.List<android.net.wifi.ScanResult.InformationElement> getInformationElements();
+    method @NonNull public int[] getSecurityTypes();
+    method @Nullable public android.net.wifi.WifiSsid getWifiSsid();
     method public int getWifiStandard();
     method public boolean is80211mcResponder();
     method public boolean isPasspointNetwork();
@@ -32,11 +55,17 @@
     field public String BSSID;
     field public static final int CHANNEL_WIDTH_160MHZ = 3; // 0x3
     field public static final int CHANNEL_WIDTH_20MHZ = 0; // 0x0
+    field public static final int CHANNEL_WIDTH_320MHZ = 5; // 0x5
     field public static final int CHANNEL_WIDTH_40MHZ = 1; // 0x1
     field public static final int CHANNEL_WIDTH_80MHZ = 2; // 0x2
     field public static final int CHANNEL_WIDTH_80MHZ_PLUS_MHZ = 4; // 0x4
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.ScanResult> CREATOR;
-    field public String SSID;
+    field public static final int PREAMBLE_EHT = 4; // 0x4
+    field public static final int PREAMBLE_HE = 3; // 0x3
+    field public static final int PREAMBLE_HT = 1; // 0x1
+    field public static final int PREAMBLE_LEGACY = 0; // 0x0
+    field public static final int PREAMBLE_VHT = 2; // 0x2
+    field @Deprecated public String SSID;
     field public static final int UNSPECIFIED = -1; // 0xffffffff
     field public static final int WIFI_BAND_24_GHZ = 1; // 0x1
     field public static final int WIFI_BAND_5_GHZ = 2; // 0x2
@@ -45,6 +74,7 @@
     field public static final int WIFI_STANDARD_11AC = 5; // 0x5
     field public static final int WIFI_STANDARD_11AD = 7; // 0x7
     field public static final int WIFI_STANDARD_11AX = 6; // 0x6
+    field public static final int WIFI_STANDARD_11BE = 8; // 0x8
     field public static final int WIFI_STANDARD_11N = 4; // 0x4
     field public static final int WIFI_STANDARD_LEGACY = 1; // 0x1
     field public static final int WIFI_STANDARD_UNKNOWN = 0; // 0x0
@@ -60,6 +90,7 @@
   }
 
   public static class ScanResult.InformationElement implements android.os.Parcelable {
+    ctor public ScanResult.InformationElement(int, int, @NonNull byte[]);
     ctor public ScanResult.InformationElement(@NonNull android.net.wifi.ScanResult.InformationElement);
     method public int describeContents();
     method @NonNull public java.nio.ByteBuffer getBytes();
@@ -74,12 +105,15 @@
     method @Nullable public android.net.MacAddress getBssid();
     method @Nullable public String getPassphrase();
     method public int getSecurityType();
-    method @Nullable public String getSsid();
+    method @Deprecated @Nullable public String getSsid();
+    method @Nullable public android.net.wifi.WifiSsid getWifiSsid();
     method public boolean isHiddenSsid();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.SoftApConfiguration> CREATOR;
     field public static final int SECURITY_TYPE_OPEN = 0; // 0x0
     field public static final int SECURITY_TYPE_WPA2_PSK = 1; // 0x1
+    field public static final int SECURITY_TYPE_WPA3_OWE = 5; // 0x5
+    field public static final int SECURITY_TYPE_WPA3_OWE_TRANSITION = 4; // 0x4
     field public static final int SECURITY_TYPE_WPA3_SAE = 3; // 0x3
     field public static final int SECURITY_TYPE_WPA3_SAE_TRANSITION = 2; // 0x2
   }
@@ -109,13 +143,22 @@
     method public int describeContents();
     method @Deprecated public android.net.ProxyInfo getHttpProxy();
     method @Deprecated @NonNull public String getKey();
+    method @Deprecated public int getMacRandomizationSetting();
     method @Deprecated @NonNull public android.net.MacAddress getRandomizedMacAddress();
+    method @Deprecated public boolean isDppConfigurator();
     method @Deprecated public boolean isPasspoint();
     method @Deprecated public void setHttpProxy(android.net.ProxyInfo);
+    method @Deprecated public void setIpConfiguration(@Nullable android.net.IpConfiguration);
+    method @Deprecated public void setMacRandomizationSetting(int);
     method @Deprecated public void setSecurityParams(int);
     method public void writeToParcel(android.os.Parcel, int);
     field @Deprecated public String BSSID;
     field @Deprecated public String FQDN;
+    field @Deprecated public static final int RANDOMIZATION_AUTO = 3; // 0x3
+    field @Deprecated public static final int RANDOMIZATION_NONE = 0; // 0x0
+    field @Deprecated public static final int RANDOMIZATION_NON_PERSISTENT = 2; // 0x2
+    field @Deprecated public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1
+    field @Deprecated public static final int SECURITY_TYPE_DPP = 13; // 0xd
     field @Deprecated public static final int SECURITY_TYPE_EAP = 3; // 0x3
     field @Deprecated public static final int SECURITY_TYPE_EAP_SUITE_B = 5; // 0x5
     field @Deprecated public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE = 9; // 0x9
@@ -217,6 +260,7 @@
     ctor public WifiEnterpriseConfig();
     ctor public WifiEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);
     method public int describeContents();
+    method public void enableTrustOnFirstUse(boolean);
     method public String getAltSubjectMatch();
     method public String getAnonymousIdentity();
     method @Nullable public java.security.cert.X509Certificate getCaCertificate();
@@ -234,9 +278,11 @@
     method public String getPlmn();
     method public String getRealm();
     method @Deprecated public String getSubjectMatch();
+    method public boolean hasCaCertificate();
     method public boolean isAuthenticationSimBased();
     method public boolean isEapMethodServerCertUsed();
     method public boolean isServerCertValidationEnabled();
+    method public boolean isTrustOnFirstUseEnabled();
     method public void setAltSubjectMatch(String);
     method public void setAnonymousIdentity(String);
     method public void setCaCertificate(@Nullable java.security.cert.X509Certificate);
@@ -289,6 +335,9 @@
 
   public class WifiInfo implements android.os.Parcelable android.net.TransportInfo {
     method public int describeContents();
+    method @NonNull public java.util.List<android.net.wifi.MloLink> getAffiliatedMloLinks();
+    method @Nullable public android.net.MacAddress getApMldMacAddress();
+    method @IntRange(from=android.net.wifi.MloLink.INVALID_MLO_LINK_ID, to=0xf) public int getApMloLinkId();
     method public String getBSSID();
     method public int getCurrentSecurityType();
     method public static android.net.NetworkInfo.DetailedState getDetailedStateOf(android.net.wifi.SupplicantState);
@@ -297,7 +346,7 @@
     method @Nullable public java.util.List<android.net.wifi.ScanResult.InformationElement> getInformationElements();
     method @Deprecated public int getIpAddress();
     method public int getLinkSpeed();
-    method @RequiresPermission(allOf={android.Manifest.permission.LOCAL_MAC_ADDRESS, android.Manifest.permission.ACCESS_FINE_LOCATION}) public String getMacAddress();
+    method public String getMacAddress();
     method public int getMaxSupportedRxLinkSpeedMbps();
     method public int getMaxSupportedTxLinkSpeedMbps();
     method public int getNetworkId();
@@ -310,11 +359,13 @@
     method public android.net.wifi.SupplicantState getSupplicantState();
     method @IntRange(from=0xffffffff) public int getTxLinkSpeedMbps();
     method public int getWifiStandard();
+    method public boolean isRestricted();
     method @NonNull public android.net.wifi.WifiInfo makeCopy(long);
     method public void writeToParcel(android.os.Parcel, int);
     field public static final String FREQUENCY_UNITS = "MHz";
     field public static final String LINK_SPEED_UNITS = "Mbps";
     field public static final int LINK_SPEED_UNKNOWN = -1; // 0xffffffff
+    field public static final int SECURITY_TYPE_DPP = 13; // 0xd
     field public static final int SECURITY_TYPE_EAP = 3; // 0x3
     field public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE = 9; // 0x9
     field public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT = 5; // 0x5
@@ -343,11 +394,12 @@
 
   public class WifiManager {
     method @Deprecated public int addNetwork(android.net.wifi.WifiConfiguration);
-    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_MANAGED_PROVISIONING}) public android.net.wifi.WifiManager.AddNetworkResult addNetworkPrivileged(@NonNull android.net.wifi.WifiConfiguration);
+    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_MANAGED_PROVISIONING}, conditional=true) public android.net.wifi.WifiManager.AddNetworkResult addNetworkPrivileged(@NonNull android.net.wifi.WifiConfiguration);
     method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public int addNetworkSuggestions(@NonNull java.util.List<android.net.wifi.WifiNetworkSuggestion>);
     method public void addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);
     method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE}) public void addSuggestionConnectionStatusListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SuggestionConnectionStatusListener);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void addSuggestionUserApprovalStatusListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SuggestionUserApprovalStatusListener);
+    method public void allowAutojoinGlobal(boolean);
     method @Deprecated public static int calculateSignalLevel(int, int);
     method @IntRange(from=0) public int calculateSignalLevel(int);
     method @Deprecated public void cancelWps(android.net.wifi.WifiManager.WpsCallback);
@@ -358,16 +410,17 @@
     method @Deprecated public boolean disableNetwork(int);
     method @Deprecated public boolean disconnect();
     method @Deprecated public boolean enableNetwork(int, boolean);
-    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_MANAGED_PROVISIONING, android.Manifest.permission.NETWORK_CARRIER_PROVISIONING}) public void flushPasspointAnqpCache();
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_MANAGED_PROVISIONING, android.Manifest.permission.NETWORK_CARRIER_PROVISIONING}, conditional=true) public void flushPasspointAnqpCache();
     method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public java.util.List<android.net.wifi.WifiConfiguration> getCallerConfiguredNetworks();
     method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE}) public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();
-    method @Deprecated public android.net.wifi.WifiInfo getConnectionInfo();
+    method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public android.net.wifi.WifiInfo getConnectionInfo();
     method @Deprecated public android.net.DhcpInfo getDhcpInfo();
     method public int getMaxNumberOfNetworkSuggestionsPerApp();
     method @IntRange(from=0) public int getMaxSignalLevel();
     method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public java.util.List<android.net.wifi.WifiNetworkSuggestion> getNetworkSuggestions();
-    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
-    method public java.util.List<android.net.wifi.ScanResult> getScanResults();
+    method @Deprecated public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public java.util.List<android.net.wifi.ScanResult> getScanResults();
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public int getStaConcurrencyForMultiInternetMode();
     method public int getWifiState();
     method public boolean is24GHzBandSupported();
     method public boolean is5GHzBandSupported();
@@ -378,6 +431,7 @@
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isCarrierNetworkOffloadEnabled(int, boolean);
     method public boolean isDecoratedIdentitySupported();
     method @Deprecated public boolean isDeviceToApRttSupported();
+    method public boolean isEasyConnectDppAkmSupported();
     method public boolean isEasyConnectEnrolleeResponderModeSupported();
     method public boolean isEasyConnectSupported();
     method public boolean isEnhancedOpenSupported();
@@ -391,37 +445,45 @@
     method public boolean isStaApConcurrencySupported();
     method public boolean isStaBridgedApConcurrencySupported();
     method public boolean isStaConcurrencyForLocalOnlyConnectionsSupported();
+    method public boolean isStaConcurrencyForMultiInternetSupported();
     method public boolean isTdlsSupported();
+    method public boolean isTrustOnFirstUseSupported();
     method public boolean isWapiSupported();
     method public boolean isWifiDisplayR2Supported();
     method public boolean isWifiEnabled();
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isWifiPasspointEnabled();
     method public boolean isWifiStandardSupported(int);
     method public boolean isWpa3SaeH2eSupported();
     method public boolean isWpa3SaePublicKeySupported();
     method public boolean isWpa3SaeSupported();
     method public boolean isWpa3SuiteBSupported();
     method @Deprecated public boolean pingSupplicant();
+    method public void queryAutojoinGlobal(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);
     method @Deprecated public boolean reassociate();
     method @Deprecated public boolean reconnect();
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void registerScanResultsCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.ScanResultsCallback);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void registerSubsystemRestartTrackingCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SubsystemRestartTrackingCallback);
     method @Deprecated public boolean removeNetwork(int);
     method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public int removeNetworkSuggestions(@NonNull java.util.List<android.net.wifi.WifiNetworkSuggestion>);
+    method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public int removeNetworkSuggestions(@NonNull java.util.List<android.net.wifi.WifiNetworkSuggestion>, int);
     method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public boolean removeNonCallerConfiguredNetworks();
-    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_CARRIER_PROVISIONING}) public void removePasspointConfiguration(String);
+    method @Deprecated public void removePasspointConfiguration(String);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void removeSuggestionConnectionStatusListener(@NonNull android.net.wifi.WifiManager.SuggestionConnectionStatusListener);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void removeSuggestionUserApprovalStatusListener(@NonNull android.net.wifi.WifiManager.SuggestionUserApprovalStatusListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.MANAGE_WIFI_INTERFACES, android.Manifest.permission.ACCESS_WIFI_STATE}) public void reportCreateInterfaceImpact(int, boolean, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.BiConsumer<java.lang.Boolean,java.util.Set<android.net.wifi.WifiManager.InterfaceCreationImpact>>);
     method @Deprecated public boolean saveConfiguration();
     method public void setTdlsEnabled(java.net.InetAddress, boolean);
     method public void setTdlsEnabledWithMacAddress(String, boolean);
     method @Deprecated public boolean setWifiEnabled(boolean);
-    method @RequiresPermission(allOf={android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void startLocalOnlyHotspot(android.net.wifi.WifiManager.LocalOnlyHotspotCallback, @Nullable android.os.Handler);
+    method @RequiresPermission(allOf={android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.NEARBY_WIFI_DEVICES}, conditional=true) public void startLocalOnlyHotspot(android.net.wifi.WifiManager.LocalOnlyHotspotCallback, @Nullable android.os.Handler);
     method @Deprecated public boolean startScan();
     method @Deprecated public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsCallback);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void unregisterScanResultsCallback(@NonNull android.net.wifi.WifiManager.ScanResultsCallback);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void unregisterSubsystemRestartTrackingCallback(@NonNull android.net.wifi.WifiManager.SubsystemRestartTrackingCallback);
     method @Deprecated public int updateNetwork(android.net.wifi.WifiConfiguration);
     field public static final String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK";
+    field public static final int ACTION_REMOVE_SUGGESTION_DISCONNECT = 2; // 0x2
+    field public static final int ACTION_REMOVE_SUGGESTION_LINGER = 1; // 0x1
     field public static final String ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE = "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE";
     field public static final String ACTION_WIFI_NETWORK_SUGGESTION_POST_CONNECTION = "android.net.wifi.action.WIFI_NETWORK_SUGGESTION_POST_CONNECTION";
     field public static final String ACTION_WIFI_SCAN_AVAILABILITY_CHANGED = "android.net.wifi.action.WIFI_SCAN_AVAILABILITY_CHANGED";
@@ -449,6 +511,7 @@
     field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_APP_DISALLOWED = 2; // 0x2
     field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_INTERNAL = 1; // 0x1
     field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_REMOVE_INVALID = 5; // 0x5
+    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_RESTRICTED_BY_ADMIN = 8; // 0x8
     field public static final int STATUS_NETWORK_SUGGESTIONS_SUCCESS = 0; // 0x0
     field public static final int STATUS_SUGGESTION_APPROVAL_APPROVED_BY_CARRIER_PRIVILEGE = 4; // 0x4
     field public static final int STATUS_SUGGESTION_APPROVAL_APPROVED_BY_USER = 2; // 0x2
@@ -462,10 +525,17 @@
     field @Deprecated public static final String SUPPLICANT_CONNECTION_CHANGE_ACTION = "android.net.wifi.supplicant.CONNECTION_CHANGE";
     field @Deprecated public static final String SUPPLICANT_STATE_CHANGED_ACTION = "android.net.wifi.supplicant.STATE_CHANGE";
     field public static final String UNKNOWN_SSID = "<unknown ssid>";
+    field public static final int WIFI_INTERFACE_TYPE_AP = 1; // 0x1
+    field public static final int WIFI_INTERFACE_TYPE_AWARE = 2; // 0x2
+    field public static final int WIFI_INTERFACE_TYPE_DIRECT = 3; // 0x3
+    field public static final int WIFI_INTERFACE_TYPE_STA = 0; // 0x0
     field @Deprecated public static final int WIFI_MODE_FULL = 1; // 0x1
     field public static final int WIFI_MODE_FULL_HIGH_PERF = 3; // 0x3
     field public static final int WIFI_MODE_FULL_LOW_LATENCY = 4; // 0x4
     field @Deprecated public static final int WIFI_MODE_SCAN_ONLY = 2; // 0x2
+    field public static final int WIFI_MULTI_INTERNET_MODE_DBS_AP = 1; // 0x1
+    field public static final int WIFI_MULTI_INTERNET_MODE_DISABLED = 0; // 0x0
+    field public static final int WIFI_MULTI_INTERNET_MODE_MULTI_AP = 2; // 0x2
     field public static final String WIFI_STATE_CHANGED_ACTION = "android.net.wifi.WIFI_STATE_CHANGED";
     field public static final int WIFI_STATE_DISABLED = 1; // 0x1
     field public static final int WIFI_STATE_DISABLING = 0; // 0x0
@@ -499,6 +569,12 @@
     field public final int statusCode;
   }
 
+  public static class WifiManager.InterfaceCreationImpact {
+    ctor public WifiManager.InterfaceCreationImpact(int, @NonNull java.util.Set<java.lang.String>);
+    method public int getInterfaceType();
+    method @NonNull public java.util.Set<java.lang.String> getPackages();
+  }
+
   public static class WifiManager.LocalOnlyHotspotCallback {
     ctor public WifiManager.LocalOnlyHotspotCallback();
     method public void onFailed(int);
@@ -586,12 +662,15 @@
     method public int describeContents();
     method @Nullable public android.net.MacAddress getBssid();
     method @Nullable public android.net.wifi.WifiEnterpriseConfig getEnterpriseConfig();
+    method public int getMacRandomizationSetting();
     method @Nullable public String getPassphrase();
     method @Nullable public android.net.wifi.hotspot2.PasspointConfiguration getPasspointConfig();
     method @IntRange(from=0) public int getPriority();
     method @IntRange(from=0) public int getPriorityGroup();
     method @Nullable public String getSsid();
+    method @Nullable public android.os.ParcelUuid getSubscriptionGroup();
     method public int getSubscriptionId();
+    method @Nullable public android.net.wifi.WifiSsid getWifiSsid();
     method public boolean isAppInteractionRequired();
     method public boolean isCarrierMerged();
     method public boolean isCredentialSharedWithUser();
@@ -599,6 +678,7 @@
     method public boolean isHiddenSsid();
     method public boolean isInitialAutojoinEnabled();
     method public boolean isMetered();
+    method public boolean isRestricted();
     method public boolean isUntrusted();
     method public boolean isUserInteractionRequired();
     method public void writeToParcel(android.os.Parcel, int);
@@ -624,11 +704,14 @@
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setPasspointConfig(@NonNull android.net.wifi.hotspot2.PasspointConfiguration);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setPriority(@IntRange(from=0) int);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setPriorityGroup(@IntRange(from=0) int);
+    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setRestricted(boolean);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setSsid(@NonNull String);
+    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setSubscriptionGroup(@NonNull android.os.ParcelUuid);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setSubscriptionId(int);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setUntrusted(boolean);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWapiEnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWapiPassphrase(@NonNull String);
+    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWifiSsid(@NonNull android.net.wifi.WifiSsid);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa2EnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa2Passphrase(@NonNull String);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa3Enterprise192BitModeConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);
@@ -637,6 +720,14 @@
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa3Passphrase(@NonNull String);
   }
 
+  public final class WifiSsid implements android.os.Parcelable {
+    method public int describeContents();
+    method @NonNull public static android.net.wifi.WifiSsid fromBytes(@Nullable byte[]);
+    method @NonNull public byte[] getBytes();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.WifiSsid> CREATOR;
+  }
+
   public class WpsInfo implements android.os.Parcelable {
     ctor public WpsInfo();
     ctor public WpsInfo(android.net.wifi.WpsInfo);
@@ -661,6 +752,7 @@
     ctor public AttachCallback();
     method public void onAttachFailed();
     method public void onAttached(android.net.wifi.aware.WifiAwareSession);
+    method public void onAwareSessionTerminated();
   }
 
   public final class AwareResources implements android.os.Parcelable {
@@ -678,12 +770,19 @@
     method public int getMaxMatchFilterLength();
     method public int getMaxServiceNameLength();
     method public int getMaxServiceSpecificInfoLength();
+    method @IntRange(from=1) public int getNumberOfSupportedDataInterfaces();
+    method @IntRange(from=1) public int getNumberOfSupportedDataPaths();
+    method @IntRange(from=1) public int getNumberOfSupportedPublishSessions();
+    method @IntRange(from=1) public int getNumberOfSupportedSubscribeSessions();
     method public int getSupportedCipherSuites();
     method public boolean isInstantCommunicationModeSupported();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.Characteristics> CREATOR;
+    field public static final int WIFI_AWARE_CIPHER_SUITE_NCS_PK_128 = 4; // 0x4
+    field public static final int WIFI_AWARE_CIPHER_SUITE_NCS_PK_256 = 8; // 0x8
     field public static final int WIFI_AWARE_CIPHER_SUITE_NCS_SK_128 = 1; // 0x1
     field public static final int WIFI_AWARE_CIPHER_SUITE_NCS_SK_256 = 2; // 0x2
+    field public static final int WIFI_AWARE_CIPHER_SUITE_NONE = 0; // 0x0
   }
 
   public class DiscoverySession implements java.lang.AutoCloseable {
@@ -700,7 +799,9 @@
     method public void onMessageSendSucceeded(int);
     method public void onPublishStarted(@NonNull android.net.wifi.aware.PublishDiscoverySession);
     method public void onServiceDiscovered(android.net.wifi.aware.PeerHandle, byte[], java.util.List<byte[]>);
+    method public void onServiceDiscovered(@NonNull android.net.wifi.aware.ServiceDiscoveryInfo);
     method public void onServiceDiscoveredWithinRange(android.net.wifi.aware.PeerHandle, byte[], java.util.List<byte[]>, int);
+    method public void onServiceDiscoveredWithinRange(@NonNull android.net.wifi.aware.ServiceDiscoveryInfo, int);
     method public void onServiceLost(@NonNull android.net.wifi.aware.PeerHandle, int);
     method public void onSessionConfigFailed();
     method public void onSessionConfigUpdated();
@@ -725,6 +826,9 @@
 
   public final class PublishConfig implements android.os.Parcelable {
     method public int describeContents();
+    method public int getInstantCommunicationBand();
+    method @Nullable public android.net.wifi.aware.WifiAwareDataPathSecurityConfig getSecurityConfig();
+    method public boolean isInstantCommunicationModeEnabled();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.PublishConfig> CREATOR;
     field public static final int PUBLISH_TYPE_SOLICITED = 1; // 0x1
@@ -734,6 +838,8 @@
   public static final class PublishConfig.Builder {
     ctor public PublishConfig.Builder();
     method public android.net.wifi.aware.PublishConfig build();
+    method @NonNull public android.net.wifi.aware.PublishConfig.Builder setDataPathSecurityConfig(@NonNull android.net.wifi.aware.WifiAwareDataPathSecurityConfig);
+    method @NonNull public android.net.wifi.aware.PublishConfig.Builder setInstantCommunicationModeEnabled(boolean, int);
     method public android.net.wifi.aware.PublishConfig.Builder setMatchFilter(@Nullable java.util.List<byte[]>);
     method public android.net.wifi.aware.PublishConfig.Builder setPublishType(int);
     method public android.net.wifi.aware.PublishConfig.Builder setRangingEnabled(boolean);
@@ -747,8 +853,18 @@
     method public void updatePublish(@NonNull android.net.wifi.aware.PublishConfig);
   }
 
+  public final class ServiceDiscoveryInfo {
+    method @NonNull public java.util.List<byte[]> getMatchFilters();
+    method public int getPeerCipherSuite();
+    method @NonNull public android.net.wifi.aware.PeerHandle getPeerHandle();
+    method @Nullable public byte[] getScid();
+    method @Nullable public byte[] getServiceSpecificInfo();
+  }
+
   public final class SubscribeConfig implements android.os.Parcelable {
     method public int describeContents();
+    method public int getInstantCommunicationBand();
+    method public boolean isInstantCommunicationModeEnabled();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.SubscribeConfig> CREATOR;
     field public static final int SUBSCRIBE_TYPE_ACTIVE = 1; // 0x1
@@ -758,6 +874,7 @@
   public static final class SubscribeConfig.Builder {
     ctor public SubscribeConfig.Builder();
     method public android.net.wifi.aware.SubscribeConfig build();
+    method @NonNull public android.net.wifi.aware.SubscribeConfig.Builder setInstantCommunicationModeEnabled(boolean, int);
     method public android.net.wifi.aware.SubscribeConfig.Builder setMatchFilter(@Nullable java.util.List<byte[]>);
     method public android.net.wifi.aware.SubscribeConfig.Builder setMaxDistanceMm(int);
     method public android.net.wifi.aware.SubscribeConfig.Builder setMinDistanceMm(int);
@@ -772,15 +889,45 @@
     method public void updateSubscribe(@NonNull android.net.wifi.aware.SubscribeConfig);
   }
 
+  public final class WifiAwareChannelInfo implements android.os.Parcelable {
+    method public int describeContents();
+    method @IntRange(from=0) public int getChannelBandwidth();
+    method @IntRange(from=0) public int getChannelFrequencyMhz();
+    method @IntRange(from=0) public int getSpatialStreamCount();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.WifiAwareChannelInfo> CREATOR;
+  }
+
+  public final class WifiAwareDataPathSecurityConfig implements android.os.Parcelable {
+    method public int describeContents();
+    method public int getCipherSuite();
+    method @Nullable public byte[] getPmk();
+    method @Nullable public byte[] getPmkId();
+    method @Nullable public String getPskPassphrase();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.WifiAwareDataPathSecurityConfig> CREATOR;
+  }
+
+  public static final class WifiAwareDataPathSecurityConfig.Builder {
+    ctor public WifiAwareDataPathSecurityConfig.Builder(int);
+    method @NonNull public android.net.wifi.aware.WifiAwareDataPathSecurityConfig build();
+    method @NonNull public android.net.wifi.aware.WifiAwareDataPathSecurityConfig.Builder setPmk(@NonNull byte[]);
+    method @NonNull public android.net.wifi.aware.WifiAwareDataPathSecurityConfig.Builder setPmkId(@NonNull byte[]);
+    method @NonNull public android.net.wifi.aware.WifiAwareDataPathSecurityConfig.Builder setPskPassphrase(@NonNull String);
+  }
+
   public class WifiAwareManager {
-    method public void attach(@NonNull android.net.wifi.aware.AttachCallback, @Nullable android.os.Handler);
-    method public void attach(@NonNull android.net.wifi.aware.AttachCallback, @NonNull android.net.wifi.aware.IdentityChangedListener, @Nullable android.os.Handler);
-    method @Nullable public android.net.wifi.aware.AwareResources getAvailableAwareResources();
-    method @Nullable public android.net.wifi.aware.Characteristics getCharacteristics();
-    method public boolean isAvailable();
-    method public boolean isDeviceAttached();
-    method public boolean isInstantCommunicationModeEnabled();
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_STATE}) public void attach(@NonNull android.net.wifi.aware.AttachCallback, @Nullable android.os.Handler);
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.NEARBY_WIFI_DEVICES}, conditional=true) public void attach(@NonNull android.net.wifi.aware.AttachCallback, @NonNull android.net.wifi.aware.IdentityChangedListener, @Nullable android.os.Handler);
+    method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.aware.AwareResources getAvailableAwareResources();
+    method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.aware.Characteristics getCharacteristics();
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isAvailable();
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isDeviceAttached();
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isInstantCommunicationModeEnabled();
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isSetChannelOnDataPathSupported();
+    field @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public static final String ACTION_WIFI_AWARE_RESOURCE_CHANGED = "android.net.wifi.aware.action.WIFI_AWARE_RESOURCE_CHANGED";
     field public static final String ACTION_WIFI_AWARE_STATE_CHANGED = "android.net.wifi.aware.action.WIFI_AWARE_STATE_CHANGED";
+    field public static final String EXTRA_AWARE_RESOURCES = "android.net.wifi.aware.extra.AWARE_RESOURCES";
     field public static final int WIFI_AWARE_DATA_PATH_ROLE_INITIATOR = 0; // 0x0
     field public static final int WIFI_AWARE_DATA_PATH_ROLE_RESPONDER = 1; // 0x1
     field public static final int WIFI_AWARE_DISCOVERY_LOST_REASON_PEER_NOT_VISIBLE = 1; // 0x1
@@ -789,6 +936,7 @@
 
   public final class WifiAwareNetworkInfo implements android.os.Parcelable android.net.TransportInfo {
     method public int describeContents();
+    method @NonNull public java.util.List<android.net.wifi.aware.WifiAwareChannelInfo> getChannelInfoList();
     method @Nullable public java.net.Inet6Address getPeerIpv6Addr();
     method public int getPort();
     method public int getTransportProtocol();
@@ -798,6 +946,9 @@
 
   public final class WifiAwareNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
     method public int describeContents();
+    method @IntRange(from=0) public int getChannelFrequencyMhz();
+    method @Nullable public android.net.wifi.aware.WifiAwareDataPathSecurityConfig getWifiAwareDataPathSecurityConfig();
+    method public boolean isChannelRequired();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.WifiAwareNetworkSpecifier> CREATOR;
   }
@@ -806,6 +957,8 @@
     ctor public WifiAwareNetworkSpecifier.Builder(@NonNull android.net.wifi.aware.DiscoverySession, @NonNull android.net.wifi.aware.PeerHandle);
     ctor public WifiAwareNetworkSpecifier.Builder(@NonNull android.net.wifi.aware.PublishDiscoverySession);
     method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier build();
+    method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setChannelFrequencyMhz(@IntRange(from=0) int, boolean);
+    method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setDataPathSecurityConfig(@NonNull android.net.wifi.aware.WifiAwareDataPathSecurityConfig);
     method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setPmk(@NonNull byte[]);
     method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setPort(@IntRange(from=0, to=65535) int);
     method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setPskPassphrase(@NonNull String);
@@ -816,8 +969,8 @@
     method public void close();
     method @Deprecated public android.net.NetworkSpecifier createNetworkSpecifierOpen(int, @NonNull byte[]);
     method @Deprecated public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(int, @NonNull byte[], @NonNull String);
-    method public void publish(@NonNull android.net.wifi.aware.PublishConfig, @NonNull android.net.wifi.aware.DiscoverySessionCallback, @Nullable android.os.Handler);
-    method public void subscribe(@NonNull android.net.wifi.aware.SubscribeConfig, @NonNull android.net.wifi.aware.DiscoverySessionCallback, @Nullable android.os.Handler);
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.NEARBY_WIFI_DEVICES}, conditional=true) public void publish(@NonNull android.net.wifi.aware.PublishConfig, @NonNull android.net.wifi.aware.DiscoverySessionCallback, @Nullable android.os.Handler);
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.NEARBY_WIFI_DEVICES}, conditional=true) public void subscribe(@NonNull android.net.wifi.aware.SubscribeConfig, @NonNull android.net.wifi.aware.DiscoverySessionCallback, @Nullable android.os.Handler);
   }
 
 }
@@ -841,6 +994,7 @@
     method public void setCredential(android.net.wifi.hotspot2.pps.Credential);
     method public void setDecoratedIdentityPrefix(@Nullable String);
     method public void setHomeSp(android.net.wifi.hotspot2.pps.HomeSp);
+    method public void setSubscriptionExpirationTimeInMillis(long);
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.PasspointConfiguration> CREATOR;
   }
@@ -979,6 +1133,7 @@
     ctor public WifiP2pDevice();
     ctor public WifiP2pDevice(android.net.wifi.p2p.WifiP2pDevice);
     method public int describeContents();
+    method @NonNull public java.util.List<android.net.wifi.ScanResult.InformationElement> getVendorElements();
     method @Nullable public android.net.wifi.p2p.WifiP2pWfdInfo getWfdInfo();
     method public boolean isGroupOwner();
     method public boolean isServiceDiscoveryCapable();
@@ -1040,36 +1195,57 @@
   }
 
   public class WifiP2pManager {
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void addLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void addExternalApprover(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.MacAddress, @NonNull android.net.wifi.p2p.WifiP2pManager.ExternalApproverRequestListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void addLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void addServiceRequest(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceRequest, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void cancelConnect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void clearLocalServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void clearServiceRequests(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void connect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pConfig, android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void createGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void createGroup(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pConfig, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void discoverPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void discoverServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void connect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pConfig, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void createGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void createGroup(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pConfig, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverPeersOnSocialChannels(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverPeersOnSpecificFrequency(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, int, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method public static int getP2pMaxAllowedVendorElementsLengthBytes();
     method public android.net.wifi.p2p.WifiP2pManager.Channel initialize(android.content.Context, android.os.Looper, android.net.wifi.p2p.WifiP2pManager.ChannelListener);
+    method public boolean isChannelConstrainedDiscoverySupported();
+    method public boolean isGroupClientRemovalSupported();
+    method public boolean isSetVendorElementsSupported();
+    method public void removeClient(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.MacAddress, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void removeExternalApprover(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.MacAddress, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void removeGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void removeLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void removeServiceRequest(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceRequest, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void requestConnectionInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ConnectionInfoListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestDeviceInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.DeviceInfoListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void requestDeviceInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.DeviceInfoListener);
     method public void requestDiscoveryState(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.DiscoveryStateListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestGroupInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.GroupInfoListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void requestGroupInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.GroupInfoListener);
     method public void requestNetworkInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.NetworkInfoListener);
     method public void requestP2pState(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.P2pStateListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.PeerListListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void requestPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.PeerListListener);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void setConnectionRequestResult(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.MacAddress, int, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void setConnectionRequestResult(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.MacAddress, int, @Nullable String, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void setDnsSdResponseListeners(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.DnsSdServiceResponseListener, android.net.wifi.p2p.WifiP2pManager.DnsSdTxtRecordListener);
     method public void setServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ServiceResponseListener);
     method public void setUpnpServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.UpnpServiceResponseListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void setVendorElements(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull java.util.List<android.net.wifi.ScanResult.InformationElement>, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void startListening(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method public void stopListening(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void stopPeerDiscovery(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    field public static final String ACTION_WIFI_P2P_REQUEST_RESPONSE_CHANGED = "android.net.wifi.p2p.action.WIFI_P2P_REQUEST_RESPONSE_CHANGED";
     field public static final int BUSY = 2; // 0x2
+    field public static final int CONNECTION_REQUEST_ACCEPT = 0; // 0x0
+    field public static final int CONNECTION_REQUEST_DEFER_SHOW_PIN_TO_SERVICE = 3; // 0x3
+    field public static final int CONNECTION_REQUEST_DEFER_TO_SERVICE = 2; // 0x2
+    field public static final int CONNECTION_REQUEST_REJECT = 1; // 0x1
     field public static final int ERROR = 0; // 0x0
     field public static final String EXTRA_DISCOVERY_STATE = "discoveryState";
     field public static final String EXTRA_NETWORK_INFO = "networkInfo";
     field public static final String EXTRA_P2P_DEVICE_LIST = "wifiP2pDeviceList";
+    field public static final String EXTRA_REQUEST_CONFIG = "android.net.wifi.p2p.extra.REQUEST_CONFIG";
+    field public static final String EXTRA_REQUEST_RESPONSE = "android.net.wifi.p2p.extra.REQUEST_RESPONSE";
     field public static final String EXTRA_WIFI_P2P_DEVICE = "wifiP2pDevice";
     field public static final String EXTRA_WIFI_P2P_GROUP = "p2pGroupInfo";
     field public static final String EXTRA_WIFI_P2P_INFO = "wifiP2pInfo";
@@ -1120,6 +1296,20 @@
     method public void onDnsSdTxtRecordAvailable(String, java.util.Map<java.lang.String,java.lang.String>, android.net.wifi.p2p.WifiP2pDevice);
   }
 
+  public static interface WifiP2pManager.ExternalApproverRequestListener {
+    method public void onAttached(@NonNull android.net.MacAddress);
+    method public void onConnectionRequested(int, @NonNull android.net.wifi.p2p.WifiP2pConfig, @NonNull android.net.wifi.p2p.WifiP2pDevice);
+    method public void onDetached(@NonNull android.net.MacAddress, int);
+    method public void onPinGenerated(@NonNull android.net.MacAddress, @NonNull String);
+    field public static final int APPROVER_DETACH_REASON_CLOSE = 3; // 0x3
+    field public static final int APPROVER_DETACH_REASON_FAILURE = 1; // 0x1
+    field public static final int APPROVER_DETACH_REASON_REMOVE = 0; // 0x0
+    field public static final int APPROVER_DETACH_REASON_REPLACE = 2; // 0x2
+    field public static final int REQUEST_TYPE_INVITATION = 1; // 0x1
+    field public static final int REQUEST_TYPE_JOIN = 2; // 0x2
+    field public static final int REQUEST_TYPE_NEGOTIATION = 0; // 0x0
+  }
+
   public static interface WifiP2pManager.GroupInfoListener {
     method public void onGroupInfoAvailable(android.net.wifi.p2p.WifiP2pGroup);
   }
@@ -1282,10 +1472,12 @@
 
   public static final class RangingRequest.Builder {
     ctor public RangingRequest.Builder();
-    method public android.net.wifi.rtt.RangingRequest.Builder addAccessPoint(@NonNull android.net.wifi.ScanResult);
-    method public android.net.wifi.rtt.RangingRequest.Builder addAccessPoints(@NonNull java.util.List<android.net.wifi.ScanResult>);
+    method @NonNull public android.net.wifi.rtt.RangingRequest.Builder addAccessPoint(@NonNull android.net.wifi.ScanResult);
+    method @NonNull public android.net.wifi.rtt.RangingRequest.Builder addAccessPoints(@NonNull java.util.List<android.net.wifi.ScanResult>);
     method @NonNull public android.net.wifi.rtt.RangingRequest.Builder addNon80211mcCapableAccessPoint(@NonNull android.net.wifi.ScanResult);
     method @NonNull public android.net.wifi.rtt.RangingRequest.Builder addNon80211mcCapableAccessPoints(@NonNull java.util.List<android.net.wifi.ScanResult>);
+    method @NonNull public android.net.wifi.rtt.RangingRequest.Builder addResponder(@NonNull android.net.wifi.rtt.ResponderConfig);
+    method @NonNull public android.net.wifi.rtt.RangingRequest.Builder addResponders(@NonNull java.util.List<android.net.wifi.rtt.ResponderConfig>);
     method public android.net.wifi.rtt.RangingRequest.Builder addWifiAwarePeer(@NonNull android.net.MacAddress);
     method public android.net.wifi.rtt.RangingRequest.Builder addWifiAwarePeer(@NonNull android.net.wifi.aware.PeerHandle);
     method public android.net.wifi.rtt.RangingRequest build();
@@ -1320,6 +1512,32 @@
     field public static final int STATUS_CODE_FAIL_RTT_NOT_AVAILABLE = 2; // 0x2
   }
 
+  public final class ResponderConfig implements android.os.Parcelable {
+    method public int describeContents();
+    method @NonNull public static android.net.wifi.rtt.ResponderConfig fromScanResult(@NonNull android.net.wifi.ScanResult);
+    method @IntRange(from=0) public int getCenterFreq0Mhz();
+    method @IntRange(from=0) public int getCenterFreq1Mhz();
+    method public int getChannelWidth();
+    method @IntRange(from=0) public int getFrequencyMhz();
+    method @Nullable public android.net.MacAddress getMacAddress();
+    method public int getPreamble();
+    method public boolean is80211mcSupported();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.rtt.ResponderConfig> CREATOR;
+  }
+
+  public static final class ResponderConfig.Builder {
+    ctor public ResponderConfig.Builder();
+    method @NonNull public android.net.wifi.rtt.ResponderConfig build();
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder set80211mcSupported(boolean);
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setCenterFreq0Mhz(@IntRange(from=0) int);
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setCenterFreq1Mhz(@IntRange(from=0) int);
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setChannelWidth(int);
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setFrequencyMhz(@IntRange(from=0) int);
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setMacAddress(@NonNull android.net.MacAddress);
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setPreamble(int);
+  }
+
   public final class ResponderLocation implements android.os.Parcelable {
     method public int describeContents();
     method public double getAltitude();
@@ -1362,7 +1580,7 @@
 
   public class WifiRttManager {
     method public boolean isAvailable();
-    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_WIFI_STATE}) public void startRanging(@NonNull android.net.wifi.rtt.RangingRequest, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.rtt.RangingResultCallback);
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.NEARBY_WIFI_DEVICES}) public void startRanging(@NonNull android.net.wifi.rtt.RangingRequest, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.rtt.RangingResultCallback);
     field public static final String ACTION_WIFI_RTT_STATE_CHANGED = "android.net.wifi.rtt.action.WIFI_RTT_STATE_CHANGED";
   }
 
diff --git a/current/sdk_library/system/framework-wifi-stubs.jar b/current/sdk_library/system/framework-wifi-stubs.jar
index fafe5b8..ac4cccd 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 87ae981..bc1656d 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 dda7481..2249e02 100644
--- a/current/sdk_library/system/framework-wifi.txt
+++ b/current/sdk_library/system/framework-wifi.txt
@@ -220,6 +220,8 @@
   }
 
   public final class ScanResult implements android.os.Parcelable {
+    method public int getBand();
+    method public void setWifiSsid(@NonNull android.net.wifi.WifiSsid);
     field public static final int CIPHER_BIP_CMAC_256 = 9; // 0x9
     field public static final int CIPHER_BIP_GMAC_128 = 7; // 0x7
     field public static final int CIPHER_BIP_GMAC_256 = 8; // 0x8
@@ -266,23 +268,32 @@
     field public static final long SOFTAP_FEATURE_BAND_6G_SUPPORTED = 128L; // 0x80L
     field public static final long SOFTAP_FEATURE_CLIENT_FORCE_DISCONNECT = 2L; // 0x2L
     field public static final long SOFTAP_FEATURE_IEEE80211_AX = 16L; // 0x10L
+    field public static final long SOFTAP_FEATURE_IEEE80211_BE = 512L; // 0x200L
     field public static final long SOFTAP_FEATURE_MAC_ADDRESS_CUSTOMIZATION = 8L; // 0x8L
+    field public static final long SOFTAP_FEATURE_WPA3_OWE = 2048L; // 0x800L
+    field public static final long SOFTAP_FEATURE_WPA3_OWE_TRANSITION = 1024L; // 0x400L
     field public static final long SOFTAP_FEATURE_WPA3_SAE = 4L; // 0x4L
   }
 
   public final class SoftApConfiguration implements android.os.Parcelable {
+    method @NonNull public int[] getAllowedAcsChannels(int);
     method @NonNull public java.util.List<android.net.MacAddress> getAllowedClientList();
     method @Deprecated public int getBand();
     method @NonNull public java.util.List<android.net.MacAddress> getBlockedClientList();
+    method public long getBridgedModeOpportunisticShutdownTimeoutMillis();
     method @Deprecated public int getChannel();
     method @NonNull public android.util.SparseIntArray getChannels();
     method public int getMacRandomizationSetting();
+    method public int getMaxChannelBandwidth();
     method public int getMaxNumberOfClients();
+    method @NonNull public android.net.MacAddress getPersistentRandomizedMacAddress();
     method public long getShutdownTimeoutMillis();
+    method @NonNull public java.util.List<android.net.wifi.ScanResult.InformationElement> getVendorElements();
     method public boolean isAutoShutdownEnabled();
     method public boolean isBridgedModeOpportunisticShutdownEnabled();
     method public boolean isClientControlByUserEnabled();
     method public boolean isIeee80211axEnabled();
+    method public boolean isIeee80211beEnabled();
     method public boolean isUserConfiguration();
     method @Nullable public android.net.wifi.WifiConfiguration toWifiConfiguration();
     field public static final int BAND_2GHZ = 1; // 0x1
@@ -290,7 +301,9 @@
     field public static final int BAND_60GHZ = 8; // 0x8
     field public static final int BAND_6GHZ = 4; // 0x4
     field @Deprecated public static final int BAND_ANY = 7; // 0x7
+    field public static final long DEFAULT_TIMEOUT = -1L; // 0xffffffffffffffffL
     field public static final int RANDOMIZATION_NONE = 0; // 0x0
+    field public static final int RANDOMIZATION_NON_PERSISTENT = 2; // 0x2
     field public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1
   }
 
@@ -298,23 +311,29 @@
     ctor public SoftApConfiguration.Builder();
     ctor public SoftApConfiguration.Builder(@NonNull android.net.wifi.SoftApConfiguration);
     method @NonNull public android.net.wifi.SoftApConfiguration build();
+    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setAllowedAcsChannels(int, @NonNull int[]);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setAllowedClientList(@NonNull java.util.List<android.net.MacAddress>);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setAutoShutdownEnabled(boolean);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBand(int);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBands(@NonNull int[]);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBlockedClientList(@NonNull java.util.List<android.net.MacAddress>);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBridgedModeOpportunisticShutdownEnabled(boolean);
+    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBridgedModeOpportunisticShutdownTimeoutMillis(@IntRange(from=0xffffffff) long);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setBssid(@Nullable android.net.MacAddress);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setChannel(int, int);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setChannels(@NonNull android.util.SparseIntArray);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setClientControlByUserEnabled(boolean);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setHiddenSsid(boolean);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setIeee80211axEnabled(boolean);
+    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setIeee80211beEnabled(boolean);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setMacRandomizationSetting(int);
+    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setMaxChannelBandwidth(int);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setMaxNumberOfClients(@IntRange(from=0) int);
     method @NonNull public android.net.wifi.SoftApConfiguration.Builder setPassphrase(@Nullable String, int);
-    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setShutdownTimeoutMillis(@IntRange(from=0) long);
-    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setSsid(@Nullable String);
+    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 setVendorElements(@NonNull java.util.List<android.net.wifi.ScanResult.InformationElement>);
+    method @NonNull public android.net.wifi.SoftApConfiguration.Builder setWifiSsid(@Nullable android.net.wifi.WifiSsid);
   }
 
   public final class SoftApInfo implements android.os.Parcelable {
@@ -329,12 +348,14 @@
     field public static final int CHANNEL_WIDTH_20MHZ = 2; // 0x2
     field public static final int CHANNEL_WIDTH_20MHZ_NOHT = 1; // 0x1
     field public static final int CHANNEL_WIDTH_2160MHZ = 7; // 0x7
+    field public static final int CHANNEL_WIDTH_320MHZ = 11; // 0xb
     field public static final int CHANNEL_WIDTH_40MHZ = 3; // 0x3
     field public static final int CHANNEL_WIDTH_4320MHZ = 8; // 0x8
     field public static final int CHANNEL_WIDTH_6480MHZ = 9; // 0x9
     field public static final int CHANNEL_WIDTH_80MHZ = 4; // 0x4
     field public static final int CHANNEL_WIDTH_80MHZ_PLUS_MHZ = 5; // 0x5
     field public static final int CHANNEL_WIDTH_8640MHZ = 10; // 0xa
+    field public static final int CHANNEL_WIDTH_AUTO = -1; // 0xffffffff
     field public static final int CHANNEL_WIDTH_INVALID = 0; // 0x0
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.SoftApInfo> CREATOR;
   }
@@ -362,8 +383,14 @@
   }
 
   @Deprecated public class WifiConfiguration implements android.os.Parcelable {
+    method @Deprecated @NonNull public java.util.Set<java.lang.String> getAllNetworkKeys();
     method @Deprecated public int getAuthType();
+    method @Deprecated @Nullable public java.util.List<android.net.MacAddress> getBssidAllowlist();
     method @Deprecated public int getDeletionPriority();
+    method @Deprecated @NonNull public byte[] getDppCSignKey();
+    method @Deprecated @NonNull public byte[] getDppConnector();
+    method @Deprecated @NonNull public byte[] getDppNetAccessKey();
+    method @Deprecated @NonNull public byte[] getDppPrivateEcKey();
     method @Deprecated @NonNull public android.net.IpConfiguration getIpConfiguration();
     method @Deprecated @NonNull public android.net.wifi.WifiConfiguration.NetworkSelectionStatus getNetworkSelectionStatus();
     method @Deprecated @NonNull public String getPrintableSsid();
@@ -373,17 +400,15 @@
     method @Deprecated public boolean isEphemeral();
     method @Deprecated public static boolean isMetered(@Nullable android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiInfo);
     method @Deprecated public boolean isNoInternetAccessExpected();
+    method @Deprecated public boolean isRepeaterEnabled();
+    method @Deprecated public void setBssidAllowlist(@Nullable java.util.List<android.net.MacAddress>);
     method @Deprecated public void setDeletionPriority(int) throws java.lang.IllegalArgumentException;
-    method @Deprecated public void setIpConfiguration(@Nullable android.net.IpConfiguration);
     method @Deprecated public void setNetworkSelectionStatus(@NonNull android.net.wifi.WifiConfiguration.NetworkSelectionStatus);
+    method @Deprecated @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setRepeaterEnabled(boolean);
     field @Deprecated public static final int INVALID_NETWORK_ID = -1; // 0xffffffff
     field @Deprecated public static final int METERED_OVERRIDE_METERED = 1; // 0x1
     field @Deprecated public static final int METERED_OVERRIDE_NONE = 0; // 0x0
     field @Deprecated public static final int METERED_OVERRIDE_NOT_METERED = 2; // 0x2
-    field @Deprecated public static final int RANDOMIZATION_AUTO = 3; // 0x3
-    field @Deprecated public static final int RANDOMIZATION_NONE = 0; // 0x0
-    field @Deprecated public static final int RANDOMIZATION_NON_PERSISTENT = 2; // 0x2
-    field @Deprecated public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1
     field @Deprecated public static final int RECENT_FAILURE_AP_UNABLE_TO_HANDLE_NEW_STA = 17; // 0x11
     field @Deprecated public static final int RECENT_FAILURE_DISCONNECTION_AP_BUSY = 1004; // 0x3ec
     field @Deprecated public static final int RECENT_FAILURE_MBO_ASSOC_DISALLOWED_AIR_INTERFACE_OVERLOADED = 1007; // 0x3ef
@@ -495,6 +520,7 @@
 
   public class WifiInfo implements android.os.Parcelable android.net.TransportInfo {
     method public double getLostTxPacketsPerSecond();
+    method @Nullable public String getNetworkKey();
     method @Nullable public String getRequestingPackageName();
     method public double getRetriedTxPacketsPerSecond();
     method public int getScore();
@@ -517,8 +543,8 @@
     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(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);
-    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void allowAutojoinGlobal(boolean);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void allowAutojoinPasspoint(@NonNull String, boolean);
+    method public void clearExternalPnoScanRequest();
     method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_COUNTRY_CODE) public void clearOverrideCountryCode();
     method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public void clearWifiConnectedNetworkScorer();
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void connect(@NonNull android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiManager.ActionListener);
@@ -529,15 +555,19 @@
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void forget(int, @Nullable android.net.wifi.WifiManager.ActionListener);
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.util.Pair<android.net.wifi.WifiConfiguration,java.util.Map<java.lang.Integer,java.util.List<android.net.wifi.ScanResult>>>> getAllMatchingWifiConfigs(@NonNull java.util.List<android.net.wifi.ScanResult>);
     method @NonNull @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public java.util.List<android.net.wifi.WifiAvailableChannel> getAllowedChannels(int, int);
-    method @Nullable @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public String getCountryCode();
+    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public String getCountryCode();
     method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public android.net.Network getCurrentNetwork();
     method public static int getEasyConnectMaxAllowedResponderDeviceInfoLength();
     method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public String[] getFactoryMacAddresses();
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void getLastCallerInfoForApi(int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.BiConsumer<java.lang.String,java.lang.Boolean>);
     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(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.READ_WIFI_CREDENTIAL}) public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();
+    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public java.util.Set<java.lang.String> getOemPrivilegedWifiAdminPackages();
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.READ_WIFI_CREDENTIAL}, conditional=true) public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();
+    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 @NonNull @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public java.util.List<android.net.wifi.WifiAvailableChannel> getUsableChannels(int, 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);
@@ -552,7 +582,11 @@
     method public boolean isVerboseLoggingEnabled();
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isWifiApEnabled();
     method public boolean isWifiScannerSupported();
+    method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public void notifyMinimumRequiredWifiSecurityLevelChanged(int);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public void notifyWifiSsidPolicyChanged(@NonNull android.app.admin.WifiSsidPolicy);
+    method @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) public void registerActiveCountryCodeChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.ActiveCountryCodeChangedCallback);
     method @RequiresPermission(android.Manifest.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS) public void registerCoexCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.CoexCallback);
+    method @RequiresPermission(android.Manifest.permission.NEARBY_WIFI_DEVICES) public void registerLocalOnlyHotspotSoftApCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SoftApCallback);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerNetworkRequestMatchCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.NetworkRequestMatchCallback);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void registerSoftApCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SoftApCallback);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerTrafficStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.TrafficStateCallback);
@@ -571,21 +605,26 @@
     method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS) public void setCoexUnsafeChannels(@NonNull java.util.List<android.net.wifi.CoexUnsafeChannel>, int);
     method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_COUNTRY_CODE) public void setDefaultCountryCode(@NonNull String);
     method @RequiresPermission(android.Manifest.permission.WIFI_SET_DEVICE_MOBILITY_STATE) public void setDeviceMobilityState(int);
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION}) public void setExternalPnoScanRequest(@NonNull java.util.List<android.net.wifi.WifiSsid>, @Nullable int[], @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.PnoScanResultsCallback);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setMacRandomizationSettingPasspointEnabled(@NonNull String, boolean);
     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 @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>);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public boolean setSoftApConfiguration(@NonNull android.net.wifi.SoftApConfiguration);
+    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(android.Manifest.permission.NETWORK_SETTINGS) public void setVerboseLoggingEnabled(boolean);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) 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);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public boolean setWifiScoringEnabled(boolean);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startEasyConnectAsConfiguratorInitiator(@NonNull String, int, int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.EasyConnectStatusCallback);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startEasyConnectAsEnrolleeInitiator(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.EasyConnectStatusCallback);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startEasyConnectAsEnrolleeResponder(@Nullable String, int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.EasyConnectStatusCallback);
-    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startLocalOnlyHotspot(@NonNull android.net.wifi.SoftApConfiguration, @Nullable java.util.concurrent.Executor, @Nullable android.net.wifi.WifiManager.LocalOnlyHotspotCallback);
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NEARBY_WIFI_DEVICES}) public void startLocalOnlyHotspot(@NonNull android.net.wifi.SoftApConfiguration, @Nullable java.util.concurrent.Executor, @Nullable android.net.wifi.WifiManager.LocalOnlyHotspotCallback);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startRestrictingAutoJoinToSubscriptionId(int);
     method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public boolean startScan(android.os.WorkSource);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startSubscriptionProvisioning(@NonNull android.net.wifi.hotspot2.OsuProvider, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.hotspot2.ProvisioningCallback);
@@ -593,7 +632,9 @@
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void stopEasyConnectSession();
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void stopRestrictingAutoJoinToSubscriptionId();
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public boolean stopSoftAp();
+    method public void unregisterActiveCountryCodeChangedCallback(@NonNull android.net.wifi.WifiManager.ActiveCountryCodeChangedCallback);
     method @RequiresPermission(android.Manifest.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS) public void unregisterCoexCallback(@NonNull android.net.wifi.WifiManager.CoexCallback);
+    method @RequiresPermission(android.Manifest.permission.NEARBY_WIFI_DEVICES) public void unregisterLocalOnlyHotspotSoftApCallback(@NonNull android.net.wifi.WifiManager.SoftApCallback);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void unregisterNetworkRequestMatchCallback(@NonNull android.net.wifi.WifiManager.NetworkRequestMatchCallback);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void unregisterSoftApCallback(@NonNull android.net.wifi.WifiManager.SoftApCallback);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void unregisterTrafficStateCallback(@NonNull android.net.wifi.WifiManager.TrafficStateCallback);
@@ -605,6 +646,12 @@
     field @RequiresPermission(android.Manifest.permission.NETWORK_CARRIER_PROVISIONING) public static final String ACTION_REFRESH_USER_PROVISIONING = "android.net.wifi.action.REFRESH_USER_PROVISIONING";
     field public static final String ACTION_REQUEST_DISABLE = "android.net.wifi.action.REQUEST_DISABLE";
     field public static final String ACTION_REQUEST_ENABLE = "android.net.wifi.action.REQUEST_ENABLE";
+    field public static final int API_AUTOJOIN_GLOBAL = 5; // 0x5
+    field public static final int API_SCANNING_ENABLED = 1; // 0x1
+    field public static final int API_SET_SCAN_SCHEDULE = 6; // 0x6
+    field public static final int API_SOFT_AP = 3; // 0x3
+    field public static final int API_TETHERED_HOTSPOT = 4; // 0x4
+    field public static final int API_WIFI_ENABLED = 2; // 0x2
     field public static final int CHANGE_REASON_ADDED = 0; // 0x0
     field public static final int CHANGE_REASON_CONFIG_CHANGE = 2; // 0x2
     field public static final int CHANGE_REASON_REMOVED = 1; // 0x1
@@ -651,7 +698,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 String WIFI_AP_STATE_CHANGED_ACTION = "android.net.wifi.WIFI_AP_STATE_CHANGED";
+    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
     field public static final int WIFI_AP_STATE_ENABLED = 13; // 0xd
@@ -665,6 +712,16 @@
   public static interface WifiManager.ActionListener {
     method public void onFailure(int);
     method public void onSuccess();
+    field public static final int FAILURE_BUSY = 2; // 0x2
+    field public static final int FAILURE_INTERNAL_ERROR = 0; // 0x0
+    field public static final int FAILURE_INVALID_ARGS = 3; // 0x3
+    field public static final int FAILURE_IN_PROGRESS = 1; // 0x1
+    field public static final int FAILURE_NOT_AUTHORIZED = 4; // 0x4
+  }
+
+  public static interface WifiManager.ActiveCountryCodeChangedCallback {
+    method public void onActiveCountryCodeChanged(@NonNull String);
+    method public void onCountryCodeInactive();
   }
 
   public abstract static class WifiManager.CoexCallback {
@@ -693,6 +750,20 @@
     method public void onWifiUsabilityStats(int, boolean, @NonNull android.net.wifi.WifiUsabilityStatsEntry);
   }
 
+  public static interface WifiManager.PnoScanResultsCallback {
+    method public void onRegisterFailed(int);
+    method public void onRegisterSuccess();
+    method public void onRemoved(int);
+    method public void onScanResultsAvailable(@NonNull java.util.List<android.net.wifi.ScanResult>);
+    field public static final int REGISTER_PNO_CALLBACK_ALREADY_REGISTERED = 1; // 0x1
+    field public static final int REGISTER_PNO_CALLBACK_PNO_NOT_SUPPORTED = 3; // 0x3
+    field public static final int REGISTER_PNO_CALLBACK_RESOURCE_BUSY = 2; // 0x2
+    field public static final int REGISTER_PNO_CALLBACK_UNKNOWN = 0; // 0x0
+    field public static final int REMOVE_PNO_CALLBACK_RESULTS_DELIVERED = 1; // 0x1
+    field public static final int REMOVE_PNO_CALLBACK_UNKNOWN = 0; // 0x0
+    field public static final int REMOVE_PNO_CALLBACK_UNREGISTERED = 2; // 0x2
+  }
+
   public static interface WifiManager.ScoreUpdateObserver {
     method public default void blocklistCurrentBssid(int);
     method public void notifyScoreUpdate(int, int);
@@ -701,6 +772,12 @@
     method public void triggerUpdateOfWifiUsabilityStats(int);
   }
 
+  public static class WifiManager.ScreenOnScanSchedule {
+    ctor public WifiManager.ScreenOnScanSchedule(@NonNull java.time.Duration, int);
+    method @NonNull public java.time.Duration getScanInterval();
+    method public int getScanType();
+  }
+
   public static interface WifiManager.SoftApCallback {
     method public default void onBlockedClientConnecting(@NonNull android.net.wifi.WifiClient, int);
     method public default void onCapabilityChanged(@NonNull android.net.wifi.SoftApCapability);
@@ -760,7 +837,8 @@
     method @NonNull @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public java.util.List<java.lang.Integer> getAvailableChannels(int);
     method @Deprecated @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public boolean getScanResults();
     method @NonNull @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public java.util.List<android.net.wifi.ScanResult> getSingleScanResults();
-    method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void registerScanListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiScanner.ScanListener);
+    method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public boolean isScanning();
+    method @RequiresPermission(anyOf={android.Manifest.permission.LOCATION_HARDWARE, android.Manifest.permission.NETWORK_STACK}) public void registerScanListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiScanner.ScanListener);
     method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void setScanningEnabled(boolean);
     method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener);
     method @Deprecated @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener, android.os.WorkSource);
@@ -905,7 +983,7 @@
     method public int getCellularDataNetworkType();
     method public int getCellularSignalStrengthDb();
     method public int getCellularSignalStrengthDbm();
-    method @IntRange(from=0, to=255) public int getChannelUtilizationRatio();
+    method @IntRange(from=0xffffffff, to=255) public int getChannelUtilizationRatio();
     method @NonNull public android.net.wifi.WifiUsabilityStatsEntry.ContentionTimeStats getContentionTimeStats(int);
     method public int getLinkSpeedMbps();
     method public int getProbeElapsedTimeSinceLastUpdateMillis();
@@ -947,12 +1025,14 @@
     field public static final int WIFI_BANDWIDTH_10_MHZ = 6; // 0x6
     field public static final int WIFI_BANDWIDTH_160_MHZ = 3; // 0x3
     field public static final int WIFI_BANDWIDTH_20_MHZ = 0; // 0x0
+    field public static final int WIFI_BANDWIDTH_320_MHZ = 7; // 0x7
     field public static final int WIFI_BANDWIDTH_40_MHZ = 1; // 0x1
     field public static final int WIFI_BANDWIDTH_5_MHZ = 5; // 0x5
     field public static final int WIFI_BANDWIDTH_80P80_MHZ = 4; // 0x4
     field public static final int WIFI_BANDWIDTH_80_MHZ = 2; // 0x2
     field public static final int WIFI_BANDWIDTH_INVALID = -1; // 0xffffffff
     field public static final int WIFI_PREAMBLE_CCK = 1; // 0x1
+    field public static final int WIFI_PREAMBLE_EHT = 6; // 0x6
     field public static final int WIFI_PREAMBLE_HE = 5; // 0x5
     field public static final int WIFI_PREAMBLE_HT = 2; // 0x2
     field public static final int WIFI_PREAMBLE_INVALID = -1; // 0xffffffff
@@ -1017,12 +1097,33 @@
 
 package android.net.wifi.aware {
 
+  public final class AwareParams implements android.os.Parcelable {
+    ctor public AwareParams();
+    method public int describeContents();
+    method public int getDiscoveryBeaconIntervalMillis();
+    method public int getDiscoveryWindowWakeInterval24Ghz();
+    method public int getDiscoveryWindowWakeInterval5Ghz();
+    method public int getMacRandomizationIntervalSeconds();
+    method public int getNumSpatialStreamsInDiscovery();
+    method public boolean isDwEarlyTerminationEnabled();
+    method public void setDiscoveryBeaconIntervalMillis(@IntRange(from=1) int);
+    method public void setDiscoveryWindowWakeInterval24Ghz(@IntRange(from=1, to=5) int);
+    method public void setDiscoveryWindowWakeInterval5Ghz(@IntRange(from=0, to=5) int);
+    method public void setDwEarlyTerminationEnabled(boolean);
+    method public void setMacRandomizationIntervalSeconds(@IntRange(from=1, to=1800) int);
+    method public void setNumSpatialStreamsInDiscovery(@IntRange(from=1) int);
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.AwareParams> CREATOR;
+    field public static final int UNSET_PARAMETER = -1; // 0xffffffff
+  }
+
   public class DiscoverySession implements java.lang.AutoCloseable {
     method @Deprecated public android.net.NetworkSpecifier createNetworkSpecifierPmk(@NonNull android.net.wifi.aware.PeerHandle, @NonNull byte[]);
   }
 
   public class WifiAwareManager {
-    method public void enableInstantCommunicationMode(boolean);
+    method @RequiresPermission(allOf={android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void enableInstantCommunicationMode(boolean);
+    method @RequiresPermission(allOf={android.Manifest.permission.OVERRIDE_WIFI_CONFIG, android.Manifest.permission.CHANGE_WIFI_STATE}) public void setAwareParams(@Nullable android.net.wifi.aware.AwareParams);
   }
 
   public class WifiAwareSession implements java.lang.AutoCloseable {
@@ -1102,13 +1203,11 @@
   public class WifiP2pManager {
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void deletePersistentGroup(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, int, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void factoryReset(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.READ_WIFI_CREDENTIAL}) public void requestPersistentGroupInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.READ_WIFI_CREDENTIAL, android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void requestPersistentGroupInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void setDeviceName(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull String, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method @RequiresPermission(android.Manifest.permission.CONFIGURE_WIFI_DISPLAY) public void setMiracastMode(int);
     method @RequiresPermission(android.Manifest.permission.CONFIGURE_WIFI_DISPLAY) public void setWfdInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pWfdInfo, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void setWifiP2pChannels(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, int, int, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void startListening(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void stopListening(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     field public static final String ACTION_WIFI_P2P_PERSISTENT_GROUPS_CHANGED = "android.net.wifi.p2p.action.WIFI_P2P_PERSISTENT_GROUPS_CHANGED";
     field public static final int MIRACAST_DISABLED = 0; // 0x0
     field public static final int MIRACAST_SINK = 2; // 0x2
@@ -1127,10 +1226,6 @@
     method @NonNull public java.util.List<android.net.wifi.rtt.ResponderConfig> getRttResponders();
   }
 
-  public static final class RangingRequest.Builder {
-    method public android.net.wifi.rtt.RangingRequest.Builder addResponder(@NonNull android.net.wifi.rtt.ResponderConfig);
-  }
-
   public final class RangingResult implements android.os.Parcelable {
     method @NonNull public byte[] getLci();
     method @NonNull public byte[] getLcr();
@@ -1139,17 +1234,15 @@
   public final class ResponderConfig implements android.os.Parcelable {
     ctor public ResponderConfig(@NonNull android.net.MacAddress, int, boolean, int, int, int, int, int);
     ctor public ResponderConfig(@NonNull android.net.wifi.aware.PeerHandle, int, boolean, int, int, int, int, int);
-    method public int describeContents();
-    method public static android.net.wifi.rtt.ResponderConfig fromScanResult(android.net.wifi.ScanResult);
-    method public static android.net.wifi.rtt.ResponderConfig fromWifiAwarePeerHandleWithDefaults(android.net.wifi.aware.PeerHandle);
-    method public static android.net.wifi.rtt.ResponderConfig fromWifiAwarePeerMacAddressWithDefaults(android.net.MacAddress);
-    method public void writeToParcel(android.os.Parcel, int);
+    method @NonNull public static android.net.wifi.rtt.ResponderConfig fromWifiAwarePeerHandleWithDefaults(@NonNull android.net.wifi.aware.PeerHandle);
+    method @NonNull public static android.net.wifi.rtt.ResponderConfig fromWifiAwarePeerMacAddressWithDefaults(@NonNull android.net.MacAddress);
     field public static final int CHANNEL_WIDTH_160MHZ = 3; // 0x3
     field public static final int CHANNEL_WIDTH_20MHZ = 0; // 0x0
+    field public static final int CHANNEL_WIDTH_320MHZ = 5; // 0x5
     field public static final int CHANNEL_WIDTH_40MHZ = 1; // 0x1
     field public static final int CHANNEL_WIDTH_80MHZ = 2; // 0x2
     field public static final int CHANNEL_WIDTH_80MHZ_PLUS_MHZ = 4; // 0x4
-    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.rtt.ResponderConfig> CREATOR;
+    field public static final int PREAMBLE_EHT = 4; // 0x4
     field public static final int PREAMBLE_HE = 3; // 0x3
     field public static final int PREAMBLE_HT = 1; // 0x1
     field public static final int PREAMBLE_LEGACY = 0; // 0x0
@@ -1163,8 +1256,8 @@
     field public final int centerFreq1;
     field public final int channelWidth;
     field public final int frequency;
-    field public final android.net.MacAddress macAddress;
-    field public final android.net.wifi.aware.PeerHandle peerHandle;
+    field @Nullable public final android.net.MacAddress macAddress;
+    field @Nullable public final android.net.wifi.aware.PeerHandle peerHandle;
     field public final int preamble;
     field public final int responderType;
     field public final boolean supports80211mc;
@@ -1176,7 +1269,7 @@
 
   public class WifiRttManager {
     method @RequiresPermission(allOf={android.Manifest.permission.LOCATION_HARDWARE}) public void cancelRanging(@Nullable android.os.WorkSource);
-    method @RequiresPermission(allOf={android.Manifest.permission.LOCATION_HARDWARE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_WIFI_STATE}) public void startRanging(@Nullable android.os.WorkSource, @NonNull android.net.wifi.rtt.RangingRequest, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.rtt.RangingResultCallback);
+    method @RequiresPermission(allOf={android.Manifest.permission.LOCATION_HARDWARE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.NEARBY_WIFI_DEVICES}, conditional=true) public void startRanging(@Nullable android.os.WorkSource, @NonNull android.net.wifi.rtt.RangingRequest, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.rtt.RangingResultCallback);
   }
 
 }
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
new file mode 100644
index 0000000..9bd6b1a
--- /dev/null
+++ b/current/snapshot-creation-build-number.txt
@@ -0,0 +1 @@
+8838219
\ No newline at end of file