Merge cherrypicks of ['googleplex-android-review.googlesource.com/30803274'] into 25Q1-release.
Change-Id: I6d03a414d0454cb738bdfad8af5534287e1db0b2
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index b886e44..8124b26 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: "12566592"
+ build_id: "12750773"
target: "train_build"
source_file: "mainline-sdks/for-latest-build/current/com.google.android.wifi/sdk/wifi-module-sdk-current.zip"
}
diff --git a/current/sdk_library/system/framework-wifi-removed.txt b/current/sdk_library/system/framework-wifi-removed.txt
index 3d804d9..0c469bc 100644
--- a/current/sdk_library/system/framework-wifi-removed.txt
+++ b/current/sdk_library/system/framework-wifi-removed.txt
@@ -2,12 +2,12 @@
package android.net.wifi {
@Deprecated public class BatchedScanResult implements android.os.Parcelable {
- ctor @Deprecated public BatchedScanResult();
- ctor @Deprecated public BatchedScanResult(android.net.wifi.BatchedScanResult);
- method @Deprecated public int describeContents();
- method @Deprecated public void writeToParcel(android.os.Parcel, int);
- field @Deprecated public final java.util.List<android.net.wifi.ScanResult> scanResults;
- field @Deprecated public boolean truncated;
+ ctor public BatchedScanResult();
+ ctor public BatchedScanResult(android.net.wifi.BatchedScanResult);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public final java.util.List<android.net.wifi.ScanResult> scanResults;
+ field public boolean truncated;
}
public final class ScanResult implements android.os.Parcelable {
