Merge cherrypicks of ['googleplex-android-review.googlesource.com/26541688'] into security-aosp-tm-release.
Change-Id: Ied8ff797f933f011de1edc62779e124a462b5574
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 05486d5..0f3a126 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "T1004342"
+ build_id: "T1006561"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.wifi/sdk/wifi-module-sdk-current.zip"
}
diff --git a/current/Android.bp b/current/Android.bp
index 8d8a110..63aad30 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,41 +1,5 @@
// 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_import",
- module_type: "java_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_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"],
-}
-
-// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py.
-soong_config_module_type {
- name: "wifi_prebuilt_prebuilt_systemserverclasspath_fragment",
- module_type: "prebuilt_systemserverclasspath_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.
@@ -43,39 +7,11 @@
}
prebuilt_bootclasspath_fragment {
- name: "wifi-module-sdk_com.android.wifi-bootclasspath-fragment@current",
- sdk_member_name: "com.android.wifi-bootclasspath-fragment",
- visibility: ["//visibility:public"],
- 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"],
- annotation_flags: "hiddenapi/annotation-flags.csv",
- metadata: "hiddenapi/metadata.csv",
- index: "hiddenapi/index.csv",
- signature_patterns: "hiddenapi/signature-patterns.csv",
- filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
- filtered_flags: "hiddenapi/filtered-flags.csv",
- },
-}
-
-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: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "wifi_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: ["com.android.wifi"],
@@ -100,55 +36,24 @@
},
}
-java_sdk_library_import {
- name: "wifi-module-sdk_framework-wifi@current",
- sdk_member_name: "framework-wifi",
+prebuilt_platform_compat_config {
+ name: "wifi-compat-config",
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true.
+ use_source_config_var: {
+ config_namespace: "wifi_module",
+ var_name: "source_build",
+ },
visibility: ["//visibility:public"],
- apex_available: [
- "com.android.wifi",
- "test_com.android.wifi",
- ],
- licenses: ["wifi-module-sdk_Android-Apache-2.0@current"],
- shared_library: false,
- permitted_packages: [
- "android.hardware.wifi",
- "android.net.wifi",
- "com.android.wifi.x",
- ],
- public: {
- jars: ["sdk_library/public/framework-wifi-stubs.jar"],
- stub_srcs: ["sdk_library/public/framework-wifi.srcjar"],
- current_api: "sdk_library/public/framework-wifi.txt",
- removed_api: "sdk_library/public/framework-wifi-removed.txt",
- annotations: "sdk_library/public/framework-wifi_annotations.zip",
- sdk_version: "module_current",
- },
- system: {
- jars: ["sdk_library/system/framework-wifi-stubs.jar"],
- stub_srcs: ["sdk_library/system/framework-wifi.srcjar"],
- current_api: "sdk_library/system/framework-wifi.txt",
- removed_api: "sdk_library/system/framework-wifi-removed.txt",
- annotations: "sdk_library/system/framework-wifi_annotations.zip",
- sdk_version: "module_current",
- },
- module_lib: {
- jars: ["sdk_library/module-lib/framework-wifi-stubs.jar"],
- stub_srcs: ["sdk_library/module-lib/framework-wifi.srcjar"],
- current_api: "sdk_library/module-lib/framework-wifi.txt",
- removed_api: "sdk_library/module-lib/framework-wifi-removed.txt",
- annotations: "sdk_library/module-lib/framework-wifi_annotations.zip",
- sdk_version: "module_current",
- },
+ licenses: ["wifi-module-sdk_Android-Apache-2.0"],
+ metadata: "compat_configs/wifi-compat-config/wifi-compat-config_meta.xml",
}
-wifi_prebuilt_java_sdk_library_import {
+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: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "wifi_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: [
@@ -189,31 +94,11 @@
}
java_import {
- name: "wifi-module-sdk_service-wifi@current",
- sdk_member_name: "service-wifi",
- visibility: [
- "//frameworks/opt/net/wifi/service/apex",
- "//frameworks/opt/net/wifi/tests/wifitests/apex",
- "//packages/modules/Wifi/apex",
- "//packages/modules/Wifi/service",
- "//packages/modules/Wifi/service/tests/wifitests/apex",
- ],
- apex_available: [
- "com.android.wifi",
- "test_com.android.wifi",
- ],
- licenses: ["wifi-module-sdk_Android-Apache-2.0@current"],
- jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-wifi.jar"],
-}
-
-wifi_prebuilt_java_import {
name: "service-wifi",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "wifi_module",
+ var_name: "source_build",
},
visibility: [
"//frameworks/opt/net/wifi/service/apex",
@@ -231,14 +116,6 @@
}
license {
- name: "wifi-module-sdk_Android-Apache-2.0@current",
- sdk_member_name: "Android-Apache-2.0",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["licenses/build/soong/licenses/LICENSE"],
-}
-
-license {
name: "wifi-module-sdk_Android-Apache-2.0",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -246,34 +123,14 @@
}
prebuilt_systemserverclasspath_fragment {
- name: "wifi-module-sdk_com.android.wifi-systemserverclasspath-fragment@current",
- sdk_member_name: "com.android.wifi-systemserverclasspath-fragment",
- visibility: ["//visibility:public"],
- apex_available: ["com.android.wifi"],
- licenses: ["wifi-module-sdk_Android-Apache-2.0@current"],
- standalone_contents: ["wifi-module-sdk_service-wifi@current"],
-}
-
-wifi_prebuilt_prebuilt_systemserverclasspath_fragment {
name: "com.android.wifi-systemserverclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "wifi_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: ["com.android.wifi"],
licenses: ["wifi-module-sdk_Android-Apache-2.0"],
standalone_contents: ["service-wifi"],
}
-
-sdk_snapshot {
- name: "wifi-module-sdk@current",
- visibility: ["//visibility:public"],
- bootclasspath_fragments: ["wifi-module-sdk_com.android.wifi-bootclasspath-fragment@current"],
- java_sdk_libs: ["wifi-module-sdk_framework-wifi@current"],
- java_systemserver_libs: ["wifi-module-sdk_service-wifi@current"],
- systemserverclasspath_fragments: ["wifi-module-sdk_com.android.wifi-systemserverclasspath-fragment@current"],
-}
diff --git a/current/compat_configs/wifi-compat-config/wifi-compat-config_meta.xml b/current/compat_configs/wifi-compat-config/wifi-compat-config_meta.xml
new file mode 100644
index 0000000..b8d6c09
--- /dev/null
+++ b/current/compat_configs/wifi-compat-config/wifi-compat-config_meta.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='utf-8'?>
+<config>
+ <compat-change description="Requires to configure MAC randomization setting to None when configuring BSSID." enableAfterTargetSdk="31" id="215656264" name="FORCE_MUTUAL_EXCLUSIVE_BSSID_MAC_RAMDONIZATION_SETTING">
+ <meta-data definedIn="android.net.wifi.SoftApConfiguration" sourcePosition="packages/modules/Wifi/framework/java/android/net/wifi/SoftApConfiguration.java:164" />
+ </compat-change>
+ <compat-change description="Removes zero support on {@link android.net.wifi.SoftApConfiguration.Builder#setShutdownTimeoutMillis(long)}." enableAfterTargetSdk="31" id="213289672" name="REMOVE_ZERO_FOR_TIMEOUT_SETTING">
+ <meta-data definedIn="android.net.wifi.SoftApConfiguration" sourcePosition="packages/modules/Wifi/framework/java/android/net/wifi/SoftApConfiguration.java:174" />
+ </compat-change>
+ <compat-change description="Local networks should not be modified by B&R since the user may have updated it with the latest configurations." enableAfterTargetSdk="32" id="234793325" name="NOT_OVERRIDE_EXISTING_NETWORKS_ON_RESTORE">
+ <meta-data definedIn="android.net.wifi.WifiManager" sourcePosition="packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java:144" />
+ </compat-change>
+</config>
\ No newline at end of file
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 372f28f..d31b510 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -356,16 +356,17 @@
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;->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;->mRemote:Landroid/os/IBinder;,unsupported
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;->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;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/net/wifi/IWifiScanner;->getMessenger()Landroid/os/Messenger;,lo-prio,max-target-o
+Landroid/net/wifi/IWifiScannerListener$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IWifiScannerListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IWifiScannerListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/IWifiScannerListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
@@ -2133,6 +2134,13 @@
Landroid/net/wifi/WifiNetworkConnectionStatistics;->numUsage:I,sdk,system-api,test-api
Landroid/net/wifi/WifiNetworkConnectionStatistics;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiNetworkConnectionStatistics;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiNetworkSpecifier$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiNetworkSpecifier$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiNetworkSpecifier$Builder;-><init>()V,public-api,sdk,system-api,test-api
@@ -2228,6 +2236,7 @@
Landroid/net/wifi/WifiNetworkSuggestion;->isUserInteractionRequired()Z,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiNetworkSuggestion;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiNetworkSuggestion;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiScanner$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner$ActionListener;->onFailure(ILjava/lang/String;)V,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner$ActionListener;->onSuccess()V,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner$BssidInfo;-><init>()V,sdk,system-api,test-api
@@ -2249,14 +2258,6 @@
Landroid/net/wifi/WifiScanner$HotlistSettings;->bssidInfos:[Landroid/net/wifi/WifiScanner$BssidInfo;,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner$HotlistSettings;->describeContents()I,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner$HotlistSettings;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner$OperationResult$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner$OperationResult$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner$OperationResult;-><init>(ILjava/lang/String;)V,lo-prio,max-target-o
-Landroid/net/wifi/WifiScanner$OperationResult;->CREATOR:Landroid/os/Parcelable$Creator;,lo-prio,max-target-o
-Landroid/net/wifi/WifiScanner$OperationResult;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner$OperationResult;->description:Ljava/lang/String;,lo-prio,max-target-o
-Landroid/net/wifi/WifiScanner$OperationResult;->reason:I,lo-prio,max-target-o
-Landroid/net/wifi/WifiScanner$OperationResult;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner$ParcelableScanData$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner$ParcelableScanData$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner$ParcelableScanData;-><init>([Landroid/net/wifi/WifiScanner$ScanData;)V,sdk,system-api,test-api
@@ -2342,12 +2343,11 @@
Landroid/net/wifi/WifiScanner$ScanSettings;->stepCount:I,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner$ScanSettings;->type:I,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner$ScanSettings;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler;->handleMessage(Landroid/os/Message;)V,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiScanner$ServiceListener$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiScanner$ServiceListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiScanner$ServiceListener$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiScanner$ServiceListener$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/net/wifi/WifiScanner$ServiceListener$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner$WifiChangeListener;->onChanging([Landroid/net/wifi/ScanResult;)V,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner$WifiChangeListener;->onQuiescence([Landroid/net/wifi/ScanResult;)V,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner$WifiChangeSettings$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -2382,7 +2382,6 @@
Landroid/net/wifi/WifiScanner;->CMD_STOP_SINGLE_SCAN:I,lo-prio,max-target-o
Landroid/net/wifi/WifiScanner;->DBG:Z,lo-prio,max-target-o
Landroid/net/wifi/WifiScanner;->GET_AVAILABLE_CHANNELS_EXTRA:Ljava/lang/String;,lo-prio,max-target-o
-Landroid/net/wifi/WifiScanner;->INVALID_KEY:I,lo-prio,max-target-o
Landroid/net/wifi/WifiScanner;->MAX_SCAN_PERIOD_MS:I,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner;->MIN_SCAN_PERIOD_MS:I,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner;->PNO_PARAMS_PNO_SETTINGS_KEY:Ljava/lang/String;,lo-prio,max-target-o
@@ -2417,29 +2416,20 @@
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;->addListener(Landroid/net/wifi/WifiScanner$ActionListener;)I,lo-prio,max-target-o
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;->getListenerKey(Ljava/lang/Object;)I,lo-prio,max-target-o
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;->isScanning()Z,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner;->mContext:Landroid/content/Context;,lo-prio,max-target-o
-Landroid/net/wifi/WifiScanner;->mInternalHandler:Landroid/os/Handler;,lo-prio,max-target-o
-Landroid/net/wifi/WifiScanner;->mListenerKey:I,lo-prio,max-target-o
-Landroid/net/wifi/WifiScanner;->mListenerMap:Landroid/util/SparseArray;,lo-prio,max-target-o
Landroid/net/wifi/WifiScanner;->mListenerMapLock:Ljava/lang/Object;,lo-prio,max-target-o
Landroid/net/wifi/WifiScanner;->mService:Landroid/net/wifi/IWifiScanner;,lo-prio,max-target-o
-Landroid/net/wifi/WifiScanner;->putListener(Ljava/lang/Object;)I,lo-prio,max-target-o
Landroid/net/wifi/WifiScanner;->registerScanListener(Landroid/net/wifi/WifiScanner$ScanListener;)V,lo-prio,max-target-o
Landroid/net/wifi/WifiScanner;->registerScanListener(Ljava/util/concurrent/Executor;Landroid/net/wifi/WifiScanner$ScanListener;)V,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner;->removeListener(I)Ljava/lang/Object;,lo-prio,max-target-o
-Landroid/net/wifi/WifiScanner;->removeListener(Ljava/lang/Object;)I,lo-prio,max-target-o
Landroid/net/wifi/WifiScanner;->setScanningEnabled(Z)V,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner;->startBackgroundScan(Landroid/net/wifi/WifiScanner$ScanSettings;Landroid/net/wifi/WifiScanner$ScanListener;)V,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner;->startBackgroundScan(Landroid/net/wifi/WifiScanner$ScanSettings;Landroid/net/wifi/WifiScanner$ScanListener;Landroid/os/WorkSource;)V,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner;->startPnoScan(Landroid/net/wifi/WifiScanner$ScanSettings;Landroid/net/wifi/WifiScanner$PnoSettings;I)V,lo-prio,max-target-o
Landroid/net/wifi/WifiScanner;->startScan(Landroid/net/wifi/WifiScanner$ScanSettings;Landroid/net/wifi/WifiScanner$ScanListener;)V,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner;->startScan(Landroid/net/wifi/WifiScanner$ScanSettings;Landroid/net/wifi/WifiScanner$ScanListener;Landroid/os/WorkSource;)V,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner;->startTrackingBssids([Landroid/net/wifi/WifiScanner$BssidInfo;ILandroid/net/wifi/WifiScanner$BssidListener;)V,sdk,system-api,test-api
@@ -2450,7 +2440,6 @@
Landroid/net/wifi/WifiScanner;->stopTrackingBssids(Landroid/net/wifi/WifiScanner$BssidListener;)V,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner;->stopTrackingWifiChange(Landroid/net/wifi/WifiScanner$WifiChangeListener;)V,sdk,system-api,test-api
Landroid/net/wifi/WifiScanner;->unregisterScanListener(Landroid/net/wifi/WifiScanner$ScanListener;)V,sdk,system-api,test-api
-Landroid/net/wifi/WifiScanner;->validateChannel()V,lo-prio,max-target-o
Landroid/net/wifi/WifiSsid$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiSsid$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
Landroid/net/wifi/WifiSsid;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index bcbe4e7..2143ca2 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -144,6 +144,10 @@
Landroid/net/wifi/IWifiScanner$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
Landroid/net/wifi/IWifiScanner$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
Landroid/net/wifi/IWifiScanner$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/net/wifi/IWifiScannerListener$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IWifiScannerListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IWifiScannerListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/net/wifi/IWifiScannerListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
Landroid/net/wifi/IWifiVerboseLoggingStatusChangedListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
@@ -1542,6 +1546,13 @@
Landroid/net/wifi/WifiNetworkConnectionStatistics;->numUsage:I,system-api,test-api
Landroid/net/wifi/WifiNetworkConnectionStatistics;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
Landroid/net/wifi/WifiNetworkConnectionStatistics;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig;->describeContents()I,public-api,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiNetworkSelectionConfig;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
Landroid/net/wifi/WifiNetworkSpecifier$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
Landroid/net/wifi/WifiNetworkSpecifier$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
Landroid/net/wifi/WifiNetworkSpecifier$Builder;-><init>()V,public-api,system-api,test-api
@@ -1637,6 +1648,7 @@
Landroid/net/wifi/WifiNetworkSuggestion;->isUserInteractionRequired()Z,public-api,system-api,test-api
Landroid/net/wifi/WifiNetworkSuggestion;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
Landroid/net/wifi/WifiNetworkSuggestion;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiScanner$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/net/wifi/WifiScanner$ActionListener;->onFailure(ILjava/lang/String;)V,system-api,test-api
Landroid/net/wifi/WifiScanner$ActionListener;->onSuccess()V,system-api,test-api
Landroid/net/wifi/WifiScanner$BssidInfo;-><init>()V,system-api,test-api
@@ -1655,10 +1667,6 @@
Landroid/net/wifi/WifiScanner$HotlistSettings;->bssidInfos:[Landroid/net/wifi/WifiScanner$BssidInfo;,system-api,test-api
Landroid/net/wifi/WifiScanner$HotlistSettings;->describeContents()I,public-api,system-api,test-api
Landroid/net/wifi/WifiScanner$HotlistSettings;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/wifi/WifiScanner$OperationResult$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/wifi/WifiScanner$OperationResult$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/net/wifi/WifiScanner$OperationResult;->describeContents()I,public-api,system-api,test-api
-Landroid/net/wifi/WifiScanner$OperationResult;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
Landroid/net/wifi/WifiScanner$ParcelableScanData$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
Landroid/net/wifi/WifiScanner$ParcelableScanData$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
Landroid/net/wifi/WifiScanner$ParcelableScanData;-><init>([Landroid/net/wifi/WifiScanner$ScanData;)V,system-api,test-api
@@ -1715,12 +1723,11 @@
Landroid/net/wifi/WifiScanner$ScanSettings;->stepCount:I,system-api,test-api
Landroid/net/wifi/WifiScanner$ScanSettings;->type:I,system-api,test-api
Landroid/net/wifi/WifiScanner$ScanSettings;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/net/wifi/WifiScanner$ServiceHandler;->handleMessage(Landroid/os/Message;)V,public-api,system-api,test-api
+Landroid/net/wifi/WifiScanner$ServiceListener$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiScanner$ServiceListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiScanner$ServiceListener$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiScanner$ServiceListener$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/net/wifi/WifiScanner$ServiceListener$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/net/wifi/WifiScanner$WifiChangeListener;->onChanging([Landroid/net/wifi/ScanResult;)V,system-api,test-api
Landroid/net/wifi/WifiScanner$WifiChangeListener;->onQuiescence([Landroid/net/wifi/ScanResult;)V,system-api,test-api
Landroid/net/wifi/WifiScanner$WifiChangeSettings$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index d6fd927..c98c9ee 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -1,7 +1,7 @@
signature,file,startline,startcol,endline,endcol,properties
-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/IWifiManager;->getWifiApEnabledState()I,packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl,227,1,227,25,
+Landroid/net/wifi/IWifiManager;->getWifiApConfiguration()Landroid/net/wifi/WifiConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl,230,1,230,25,
+Landroid/net/wifi/IWifiManager;->getCurrentNetwork()Landroid/net/Network;,packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl,255,1,255,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
@@ -36,17 +36,17 @@
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,3230,5,3230,25,
-Landroid/net/wifi/WifiConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3718,5,3718,25,
-Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3724,5,3724,25,
-Landroid/net/wifi/WifiConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3734,5,3734,25,
-Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3740,5,3740,25,
-Landroid/net/wifi/WifiConfiguration;->getProxySettings()Landroid/net/IpConfiguration$ProxySettings;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3750,5,3750,25,
-Landroid/net/wifi/WifiConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3756,5,3756,25,
-Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3817,5,3817,25,
-Landroid/net/wifi/WifiConfiguration;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,4037,5,4037,25,
+Landroid/net/wifi/WifiConfiguration;->noInternetAccessExpected:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1456,5,1456,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiConfiguration;->selfAdded:Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1510,5,1510,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiConfiguration;->isEnterprise()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3261,5,3261,25,
+Landroid/net/wifi/WifiConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3763,5,3763,25,
+Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3769,5,3769,25,
+Landroid/net/wifi/WifiConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3779,5,3779,25,
+Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3785,5,3785,25,
+Landroid/net/wifi/WifiConfiguration;->getProxySettings()Landroid/net/IpConfiguration$ProxySettings;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3795,5,3795,25,
+Landroid/net/wifi/WifiConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3801,5,3801,25,
+Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3861,5,3861,25,
+Landroid/net/wifi/WifiConfiguration;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,4083,5,4083,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,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,
@@ -68,22 +68,22 @@
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,4824,5,4824,25,
-Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,6851,5,6851,25,
-Landroid/net/wifi/WifiManager;->enableVerboseLogging(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,6891,5,6894,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/WifiManager;->LINK_CONFIGURATION_CHANGED_ACTION:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1287,5,1287,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiManager;->MIN_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1483,5,1483,25,
+Landroid/net/wifi/WifiManager;->MAX_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1487,5,1487,25,
+Landroid/net/wifi/WifiManager;->RSSI_LEVELS:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1497,5,1497,88,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_AUTO:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1506,5,1506,25,
+Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_5GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1513,5,1513,25,
+Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_2GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1520,5,1520,25,
+Landroid/net/wifi/WifiManager;->mActiveLockCount:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1576,5,1576,25,
+Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1580,5,1580,25,
+Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,4964,5,4964,25,
+Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,7006,5,7006,25,
+Landroid/net/wifi/WifiManager;->enableVerboseLogging(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,7046,5,7049,6,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+%23setVerboseLoggingEnabled%28boolean%29%7D+instead.%22
+Landroid/net/wifi/WifiSsid;->octets:Ljava/io/ByteArrayOutputStream;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,206,5,206,69,publicAlternatives=%22%7B%40link+%23getBytes%28%29%7D%22
+Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,214,5,214,99,publicAlternatives=%22%7B%40link+android.net.wifi.WifiManager%23UNKNOWN_SSID%7D%22
+Landroid/net/wifi/WifiSsid;->createFromAsciiEncoded(Ljava/lang/String;)Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,222,5,222,76,publicAlternatives=%22%7B%40link+%23fromBytes%28byte%5B%5D%29%7D%22
+Landroid/net/wifi/WifiSsid;->getOctets()[B,packages/modules/Wifi/framework/java/android/net/wifi/WifiSsid.java,232,5,232,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,108,5,108,25,
@@ -101,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,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/WifiP2pManager$Channel;->mAsyncChannel:Lcom/android/internal/util/AsyncChannel;,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,1232,9,1232,29,
+Landroid/net/wifi/p2p/WifiP2pManager$Channel;->putListener(Ljava/lang/Object;)I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,1476,9,1476,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/p2p/WifiP2pManager;->CREATE_GROUP:I,packages/modules/Wifi/framework/java/android/net/wifi/p2p/WifiP2pManager.java,551,5,551,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,792,5,792,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,2027,5,2027,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,2368,5,2368,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,
@@ -139,7 +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/base/core/java/com/android/internal/util/IState.java,71,5,71,25,
+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,23 +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/base/core/java/com/android/internal/util/State.java,35,5,35,25,
-Lcom/android/internal/util/State;->enter()V,frameworks/base/core/java/com/android/internal/util/State.java,42,5,42,25,
-Lcom/android/internal/util/State;->exit()V,frameworks/base/core/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/base/core/java/com/android/internal/util/State.java,58,5,58,25,
-Lcom/android/internal/util/State;->getName()Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/State.java,76,5,76,25,
-Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;)V,frameworks/base/core/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/base/core/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/base/core/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/base/core/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/base/core/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/base/core/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/base/core/java/com/android/internal/util/StateMachine.java,1684,5,1684,25,
-Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1704,5,1704,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1714,5,1714,25,
-Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1728,5,1728,25,
-Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/base/core/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/base/core/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/base/core/java/com/android/internal/util/StateMachine.java,1783,5,1783,25,
-Lcom/android/internal/util/StateMachine;->start()V,frameworks/base/core/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/base/core/java/com/android/internal/util/StateMachine.java,2087,5,2087,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 8ceef3b..63c5e5e 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: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/IWifiManager;->getCurrentNetwork()Landroid/net/Network;|,|30|,|packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl:255:1:255:69|,||,|170729553|
+|Landroid/net/wifi/IWifiManager;->getWifiApConfiguration()Landroid/net/wifi/WifiConfiguration;|,||,|packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl:230:1:230:25|,||,||
+|Landroid/net/wifi/IWifiManager;->getWifiApEnabledState()I|,||,|packages/modules/Wifi/framework/java/android/net/wifi/IWifiManager.aidl:227:1:227: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|
diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
index 8778dc9..ef996fa 100644
--- a/current/hiddenapi/signature-patterns.csv
+++ b/current/hiddenapi/signature-patterns.csv
@@ -28,6 +28,7 @@
android/net/wifi/IWifiConnectedNetworkScorer
android/net/wifi/IWifiManager
android/net/wifi/IWifiScanner
+android/net/wifi/IWifiScannerListener
android/net/wifi/IWifiVerboseLoggingStatusChangedListener
android/net/wifi/MloLink
android/net/wifi/ParcelUtil
@@ -51,6 +52,7 @@
android/net/wifi/WifiManager
android/net/wifi/WifiNetworkAgentSpecifier
android/net/wifi/WifiNetworkConnectionStatistics
+android/net/wifi/WifiNetworkSelectionConfig
android/net/wifi/WifiNetworkSpecifier
android/net/wifi/WifiNetworkSuggestion
android/net/wifi/WifiScanner
diff --git a/current/sdk_library/public/framework-wifi-stubs.jar b/current/sdk_library/public/framework-wifi-stubs.jar
index 0da9e12..61dd763 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 07580d2..10d2a8e 100644
--- a/current/sdk_library/public/framework-wifi.srcjar
+++ b/current/sdk_library/public/framework-wifi.srcjar
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 1d3a597..b28c23d 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8810646
\ No newline at end of file
+9832159
\ No newline at end of file
