Snap for 8989105 from ddb139b9dd2571c0ff75b82aebe9cc2e5b525293 to tm-qpr1-release

Change-Id: I03737cc86b102206c70e7c6c3e1b15874d4c5cf5

11 files changed, 222 insertions, 103 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 61ac04d..05486d5 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: "T1004614"
+    build_id: "T1004342"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.wifi/sdk/wifi-module-sdk-current.zip"
   }
@@ -8,7 +8,7 @@ drops {
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/Wifi"
-  git_branch: "master"
+  git_branch: "tm-dev"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/current/Android.bp b/current/Android.bp
index 63aad30..8d8a110 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,5 +1,41 @@
 // 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.
@@ -7,11 +43,39 @@ package {
 }
 
 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.
-    use_source_config_var: {
-        config_namespace: "wifi_module",
-        var_name: "source_build",
+    prefer: true,
+    soong_config_variables: {
+        source_build: {
+            prefer: false,
+        },
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.wifi"],
@@ -36,24 +100,55 @@ prebuilt_bootclasspath_fragment {
     },
 }
 
-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",
-    },
+java_sdk_library_import {
+    name: "wifi-module-sdk_framework-wifi@current",
+    sdk_member_name: "framework-wifi",
     visibility: ["//visibility:public"],
-    licenses: ["wifi-module-sdk_Android-Apache-2.0"],
-    metadata: "compat_configs/wifi-compat-config/wifi-compat-config_meta.xml",
+    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",
+    },
 }
 
-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.
-    use_source_config_var: {
-        config_namespace: "wifi_module",
-        var_name: "source_build",
+    prefer: true,
+    soong_config_variables: {
+        source_build: {
+            prefer: false,
+        },
     },
     visibility: ["//visibility:public"],
     apex_available: [
@@ -94,11 +189,31 @@ java_sdk_library_import {
 }
 
 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.
-    use_source_config_var: {
-        config_namespace: "wifi_module",
-        var_name: "source_build",
+    prefer: true,
+    soong_config_variables: {
+        source_build: {
+            prefer: false,
+        },
     },
     visibility: [
         "//frameworks/opt/net/wifi/service/apex",
@@ -116,6 +231,14 @@ java_import {
 }
 
 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"],
@@ -123,14 +246,34 @@ license {
 }
 
 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.
-    use_source_config_var: {
-        config_namespace: "wifi_module",
-        var_name: "source_build",
+    prefer: true,
+    soong_config_variables: {
+        source_build: {
+            prefer: false,
+        },
     },
     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
deleted file mode 100644
index 05c8707..0000000
--- a/current/compat_configs/wifi-compat-config/wifi-compat-config_meta.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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:157" />
-  </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:167" />
-  </compat-change>
-</config>
\ No newline at end of file
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 24446a3..372f28f 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -2133,13 +2133,6 @@ Landroid/net/wifi/WifiNetworkConnectionStatistics;->numConnection:I,sdk,system-a
 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
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 498a53f..bcbe4e7 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -1542,13 +1542,6 @@ Landroid/net/wifi/WifiNetworkConnectionStatistics;->numConnection:I,system-api,t
 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
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index b757cca..d6fd927 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,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/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
@@ -38,15 +38,15 @@ Landroid/net/wifi/WifiConfiguration;->INVALID_RSSI:I,packages/modules/Wifi/frame
 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,3263,5,3263,25,
-Landroid/net/wifi/WifiConfiguration;->getStaticIpConfiguration()Landroid/net/StaticIpConfiguration;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3765,5,3765,25,
-Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3771,5,3771,25,
-Landroid/net/wifi/WifiConfiguration;->getIpAssignment()Landroid/net/IpConfiguration$IpAssignment;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3781,5,3781,25,
-Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3787,5,3787,25,
-Landroid/net/wifi/WifiConfiguration;->getProxySettings()Landroid/net/IpConfiguration$ProxySettings;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3797,5,3797,25,
-Landroid/net/wifi/WifiConfiguration;->setProxySettings(Landroid/net/IpConfiguration$ProxySettings;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3803,5,3803,25,
-Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3863,5,3863,25,
-Landroid/net/wifi/WifiConfiguration;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,4085,5,4085,25,
+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/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(Landroid/net/wifi/SupplicantStat
 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,1265,5,1265,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiManager;->MIN_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1461,5,1461,25,
-Landroid/net/wifi/WifiManager;->MAX_RSSI:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1465,5,1465,25,
-Landroid/net/wifi/WifiManager;->RSSI_LEVELS:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1475,5,1475,88,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_AUTO:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1484,5,1484,25,
-Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_5GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1491,5,1491,25,
-Landroid/net/wifi/WifiManager;->WIFI_FREQUENCY_BAND_2GHZ:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1498,5,1498,25,
-Landroid/net/wifi/WifiManager;->mActiveLockCount:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1554,5,1554,25,
-Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager;,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,1558,5,1558,25,
-Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,4942,5,4942,25,
-Landroid/net/wifi/WifiManager;->initializeMulticastFiltering()Z,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,6969,5,6969,25,
-Landroid/net/wifi/WifiManager;->enableVerboseLogging(I)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiManager.java,7009,5,7012,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/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/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,
@@ -105,8 +105,8 @@ Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mAsyncChannel:Lcom/android/intern
 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,2000,5,2000,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,2340,5,2340,88,maxTargetSdk=30&trackingBug=170729553L
+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,
@@ -139,7 +139,7 @@ Lcom/android/internal/util/AsyncChannel;->replyToMessage(Landroid/os/Message;III
 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/IState;->getName()Ljava/lang/String;,frameworks/base/core/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;->checkNotNull(Ljava/lang/Object;Ljava/
 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
+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
diff --git a/current/hiddenapi/metadata.csv b/current/hiddenapi/metadata.csv
index 63c5e5e..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: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/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|
diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
index 33c2b4b..8778dc9 100644
--- a/current/hiddenapi/signature-patterns.csv
+++ b/current/hiddenapi/signature-patterns.csv
@@ -51,7 +51,6 @@ android/net/wifi/WifiInfo
 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 deafd34..0da9e12 100644
--- a/current/sdk_library/public/framework-wifi-stubs.jar
+++ b/current/sdk_library/public/framework-wifi-stubs.jar
diff --git a/current/sdk_library/public/framework-wifi.srcjar b/current/sdk_library/public/framework-wifi.srcjar
index 3d13b55..07580d2 100644
--- a/current/sdk_library/public/framework-wifi.srcjar
+++ b/current/sdk_library/public/framework-wifi.srcjar
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 3a39c96..1d3a597 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8953649
\ No newline at end of file
+8810646
\ No newline at end of file