[automerger skipped] Merge SP1A.211205.008 am: 96dccee28a am: cad26795d1 -s ours am: 345de7f775 -s ours
am skip reason: Merged-In Ie8480c46c91ffa756edb2c85fc565d2e1d1504a5 with SHA-1 f87b20864d is already in history
Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/1930745
Change-Id: Id5af58049f7e3b01cc39be9b1e9ded9b36ecb075
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 8bc3a33..136f28f 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: "7785637"
+ build_id: "7801381"
target: "mainline_modules-user"
source_file: "mainline-sdks/wifi-module-sdk-current.zip"
}
@@ -8,7 +8,7 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/Wifi"
- git_branch: "sc-qpr1-dev"
+ git_branch: "sc-v2-dev"
transform: TRANSFORM_UNZIP
transform_options {
rename {
diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index 9a1aafe..b64e4b8 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv
@@ -1363,6 +1363,7 @@
Landroid/net/wifi/ScanResult$InformationElement;-><init>(Landroid/net/wifi/ScanResult$InformationElement;)V,public-api,sdk,system-api,test-api
Landroid/net/wifi/ScanResult$InformationElement;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,sdk,system-api,test-api
Landroid/net/wifi/ScanResult$InformationElement;->EID_BSS_LOAD:I,max-target-r
+Landroid/net/wifi/ScanResult$InformationElement;->EID_COUNTRY:I,blocked
Landroid/net/wifi/ScanResult$InformationElement;->EID_ERP:I,max-target-r
Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_CAPS:I,max-target-r
Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_SUPPORTED_RATES:I,max-target-r
@@ -7500,6 +7501,7 @@
Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->any(Ljava/util/Collection;Ljava/util/function/Predicate;)Z,blocked
Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([II)Z,blocked
Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z,blocked
+Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([SS)Z,blocked
Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->filter(Ljava/util/Collection;Ljava/util/function/Predicate;)Ljava/util/ArrayList;,blocked
Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->indexOf(Ljava/util/Collection;Ljava/util/function/Predicate;)I,blocked
Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->indexOf([Ljava/lang/Object;Ljava/lang/Object;)I,blocked
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index f6fa65e..27ee353 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -5,18 +5,18 @@
Landroid/net/wifi/ScanResult$InformationElement;->EID_SSID:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,902,9,902,92,maxTargetSdk=30&trackingBug=170729553L
Landroid/net/wifi/ScanResult$InformationElement;->EID_SUPPORTED_RATES:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,905,9,905,92,maxTargetSdk=30&trackingBug=170729553L
Landroid/net/wifi/ScanResult$InformationElement;->EID_TIM:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,908,9,908,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_BSS_LOAD:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,911,9,911,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_ERP:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,914,9,914,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_RSN:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,919,9,919,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_SUPPORTED_RATES:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,922,9,922,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_HT_OPERATION:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,925,9,925,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_INTERWORKING:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,928,9,928,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_ROAMING_CONSORTIUM:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,931,9,931,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_CAPS:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,934,9,934,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_VHT_OPERATION:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,939,9,939,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->EID_VSA:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,942,9,942,92,maxTargetSdk=30&trackingBug=170729553L
-Landroid/net/wifi/ScanResult$InformationElement;->id:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,954,9,954,29,
-Landroid/net/wifi/ScanResult$InformationElement;->bytes:[B,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,960,9,960,29,
+Landroid/net/wifi/ScanResult$InformationElement;->EID_BSS_LOAD:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,913,9,913,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_ERP:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,916,9,916,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_RSN:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,921,9,921,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_SUPPORTED_RATES:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,924,9,924,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_HT_OPERATION:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,927,9,927,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_INTERWORKING:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,930,9,930,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_ROAMING_CONSORTIUM:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,933,9,933,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_CAPS:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,936,9,936,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_VHT_OPERATION:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,941,9,941,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->EID_VSA:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,944,9,944,92,maxTargetSdk=30&trackingBug=170729553L
+Landroid/net/wifi/ScanResult$InformationElement;->id:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,956,9,956,29,
+Landroid/net/wifi/ScanResult$InformationElement;->bytes:[B,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,962,9,962,29,
Landroid/net/wifi/ScanResult;->wifiSsid:Landroid/net/wifi/WifiSsid;,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,56,5,56,25,
Landroid/net/wifi/ScanResult;->hessid:J,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,68,5,68,25,
Landroid/net/wifi/ScanResult;->anqpDomainId:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,75,5,75,25,
@@ -27,7 +27,7 @@
Landroid/net/wifi/ScanResult;->distanceSdCm:I,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,546,5,546,25,
Landroid/net/wifi/ScanResult;->flags:J,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,563,5,563,25,
Landroid/net/wifi/ScanResult;->anqpLines:Ljava/util/List;,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,894,5,894,25,
-Landroid/net/wifi/ScanResult;->informationElements:[Landroid/net/wifi/ScanResult$InformationElement;,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1060,5,1060,25,
+Landroid/net/wifi/ScanResult;->informationElements:[Landroid/net/wifi/ScanResult$InformationElement;,packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java,1062,5,1062,25,
Landroid/net/wifi/WifiConfiguration;->wepKeyVarNames:[Ljava/lang/String;,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,84,5,84,25,
Landroid/net/wifi/WifiConfiguration;->apBand:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1030,5,1030,25,
Landroid/net/wifi/WifiConfiguration;->apChannel:I,packages/modules/Wifi/framework/java/android/net/wifi/WifiConfiguration.java,1041,5,1041,25,
diff --git a/current/hiddenapi/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index fb4b727..bd44b6e 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv
@@ -1363,6 +1363,7 @@
Landroid/net/wifi/ScanResult$InformationElement;-><init>(Landroid/net/wifi/ScanResult$InformationElement;)V,public-api,system-api,test-api
Landroid/net/wifi/ScanResult$InformationElement;->CREATOR:Landroid/os/Parcelable$Creator;,public-api,system-api,test-api
Landroid/net/wifi/ScanResult$InformationElement;->EID_BSS_LOAD:I
+Landroid/net/wifi/ScanResult$InformationElement;->EID_COUNTRY:I
Landroid/net/wifi/ScanResult$InformationElement;->EID_ERP:I
Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_CAPS:I
Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_SUPPORTED_RATES:I
@@ -7500,6 +7501,7 @@
Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->any(Ljava/util/Collection;Ljava/util/function/Predicate;)Z
Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([II)Z
Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z
+Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->contains([SS)Z
Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->filter(Ljava/util/Collection;Ljava/util/function/Predicate;)Ljava/util/ArrayList;
Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->indexOf(Ljava/util/Collection;Ljava/util/function/Predicate;)I
Lcom/android/wifi/x/com/android/net/module/util/CollectionUtils;->indexOf([Ljava/lang/Object;Ljava/lang/Object;)I
