Merge cherrypicks of [15636132, 15634622, 15636419, 15634623, 15635081, 15636346, 15636347, 15635821, 15635822, 15635823, 15635824, 15636496, 15636421, 15635984, 15636005, 15636133, 15635225, 15635189, 15636250, 15636380, 15636422, 15636348, 15636349, 15636350, 15632848, 15636382, 15636383, 15636266, 15636351, 15636423, 15636352, 15635986, 15636220, 15636252] into sc-d1-release
Change-Id: I933935e5abb7b2d452c38fc00e96824ce2db8de7
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index b301013..9837a02 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: "7611331"
+ build_id: "7653768"
target: "mainline_modules-user"
source_file: "mainline-sdks/wifi-module-sdk-current.zip"
}
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index f43b0f7..f6fa65e 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -48,8 +48,8 @@
Landroid/net/wifi/WifiConfiguration;->setProxy(Landroid/net/IpConfiguration$ProxySettings;Landroid/net/ProxyInfo;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3525,5,3525,25,
Landroid/net/wifi/WifiConfiguration;->CREATOR:Landroid/os/Parcelable$Creator;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,3721,5,3721,25,
Landroid/net/wifi/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,708,5,708,25,
-Landroid/net/wifi/WifiEnterpriseConfig;->getCaCertificateAlias()Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,749,5,749,25,
+Landroid/net/wifi/WifiEnterpriseConfig;->setCaCertificateAlias(Ljava/lang/String;)V,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,704,5,704,25,
+Landroid/net/wifi/WifiEnterpriseConfig;->getCaCertificateAlias()Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiEnterpriseConfig.java,745,5,745,25,
Landroid/net/wifi/WifiInfo;->mBSSID:Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,108,5,108,88,maxTargetSdk=28&trackingBug=115609023L
Landroid/net/wifi/WifiInfo;->mWifiSsid:Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,110,5,110,25,
Landroid/net/wifi/WifiInfo;->mIpAddress:Ljava/net/InetAddress;,packages/modules/Wifi/framework/java/android/net/wifi/WifiInfo.java,244,5,244,25,
diff --git a/current/sdk_library/public/framework-wifi-stubs.jar b/current/sdk_library/public/framework-wifi-stubs.jar
index 59457f8..41bcc6d 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 a728ff5..71c6c71 100644
--- a/current/sdk_library/public/framework-wifi.srcjar
+++ b/current/sdk_library/public/framework-wifi.srcjar
Binary files differ
