DO NOT MERGE: Drop prebuilt files to android source tree.
The following files have been updated as part of this change:
current/Android.bp
current/snapshot-creation-build-number.txt
current/compat_configs/wifi-compat-config/wifi-compat-config_meta.xml
current/java_systemserver_libs/snapshot/jars/are/invalid/service-wifi.jar
current/hiddenapi/annotation-flags.csv
current/hiddenapi/filtered-flags.csv
current/hiddenapi/filtered-stub-flags.csv
current/hiddenapi/hiddenapi-max-target-o-low-priority.txt
current/hiddenapi/hiddenapi-max-target-r-low-priority.txt
current/hiddenapi/hiddenapi-unsupported.txt
current/hiddenapi/index.csv
current/hiddenapi/metadata.csv
current/hiddenapi/signature-patterns.csv
current/licenses/build/soong/licenses/LICENSE
current/sdk_library/system/framework-wifi-removed.txt
current/sdk_library/system/framework-wifi-stubs.jar
current/sdk_library/system/framework-wifi.srcjar
current/sdk_library/system/framework-wifi.txt
current/sdk_library/system/framework-wifi_annotations.zip
current/sdk_library/public/framework-wifi-removed.txt
current/sdk_library/public/framework-wifi-stubs.jar
current/sdk_library/public/framework-wifi.srcjar
current/sdk_library/public/framework-wifi.txt
current/sdk_library/public/framework-wifi_annotations.zip
current/sdk_library/module-lib/framework-wifi-removed.txt
current/sdk_library/module-lib/framework-wifi-stubs.jar
current/sdk_library/module-lib/framework-wifi.srcjar
current/sdk_library/module-lib/framework-wifi.txt
current/sdk_library/module-lib/framework-wifi_annotations.zip
Built here: ab/12750773
This build IS suitable for public release.
The change is generated with prebuilt drop tool.
Test: presubmit
Bug: 382548950
Flag: build.RELEASE_APEX_CONTRIBUTIONS_WIFI
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d8fd9e1bdd383a01d4679a392f42841363f5b88a)
Merged-In: I3a03fc8c0fc752e51a13034b15e1326ffaa61f79
Change-Id: I3a03fc8c0fc752e51a13034b15e1326ffaa61f79
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 {
