[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: da4fa16b5b -s ours am: e821765a4e -s ours
am skip reason: Merged-In I9d1c32c8852d353130df7b95f3b5b8c8bbe75bc2 with SHA-1 946dc5784c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/16845405
Change-Id: Ibeb9f5176122d61f286e8ce30a7e4275052531c3
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 136f28f..6e26ac6 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: "7801381"
+ build_id: "7542407"
target: "mainline_modules-user"
source_file: "mainline-sdks/wifi-module-sdk-current.zip"
}
@@ -8,12 +8,6 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/Wifi"
- git_branch: "sc-v2-dev"
+ git_branch: "sc-dev"
transform: TRANSFORM_UNZIP
- transform_options {
- rename {
- from_path: "Android.bp"
- to_path: "Android.bp.auto"
- }
- }
}
diff --git a/current/Android.bp b/current/Android.bp
index 4cd2380..e3a4210 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -67,11 +67,6 @@
],
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"],
@@ -113,11 +108,6 @@
],
licenses: ["wifi-module-sdk_Android-Apache-2.0"],
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"],
diff --git a/current/Android.bp.auto b/current/Android.bp.auto
deleted file mode 100755
index 0e28b2d..0000000
--- a/current/Android.bp.auto
+++ /dev/null
@@ -1,143 +0,0 @@
-// This is auto-generated. DO NOT EDIT.
-
-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.
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-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"],
- 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"],
- stub_flags: "hiddenapi/stub-flags.csv",
- annotation_flags: "hiddenapi/annotation-flags.csv",
- metadata: "hiddenapi/metadata.csv",
- index: "hiddenapi/index.csv",
- all_flags: "hiddenapi/all-flags.csv",
- },
-}
-
-prebuilt_bootclasspath_fragment {
- name: "com.android.wifi-bootclasspath-fragment",
- prefer: false,
- visibility: ["//visibility:public"],
- apex_available: ["com.android.wifi"],
- licenses: ["wifi-module-sdk_Android-Apache-2.0"],
- contents: ["framework-wifi"],
- 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"],
- stub_flags: "hiddenapi/stub-flags.csv",
- annotation_flags: "hiddenapi/annotation-flags.csv",
- metadata: "hiddenapi/metadata.csv",
- index: "hiddenapi/index.csv",
- all_flags: "hiddenapi/all-flags.csv",
- },
-}
-
-java_sdk_library_import {
- name: "wifi-module-sdk_framework-wifi@current",
- sdk_member_name: "framework-wifi",
- visibility: ["//visibility:public"],
- 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",
- 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",
- 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",
- sdk_version: "module_current",
- },
-}
-
-java_sdk_library_import {
- name: "framework-wifi",
- prefer: false,
- visibility: ["//visibility:public"],
- apex_available: [
- "com.android.wifi",
- "test_com.android.wifi",
- ],
- licenses: ["wifi-module-sdk_Android-Apache-2.0"],
- 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",
- 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",
- 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",
- sdk_version: "module_current",
- },
-}
-
-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"],
- license_text: ["licenses/build/soong/licenses/LICENSE"],
-}
-
-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"],
-}
diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index b64e4b8..cc617c4 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv
@@ -1363,7 +1363,6 @@
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
@@ -7501,7 +7500,6 @@
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
@@ -7712,6 +7710,7 @@
Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VEHICLE_INTERNAL:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VSIM:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->RESTRICTED_CAPABILITIES:J,blocked
+Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->TRANSPORT_USB:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->UNRESTRICTED_CAPABILITIES:J,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->getDisplayTransport([I)I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->inferRestrictedCapability(Landroid/net/NetworkCapabilities;)Z,blocked
@@ -7745,7 +7744,6 @@
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ECHO_REPLY_TYPE:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ECHO_REQUEST_TYPE:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_HEADER_MIN_LEN:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NA_HEADER_LEN:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_LENGTH_SCALING_FACTOR:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MIN_LENGTH:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MTU:I,blocked
@@ -7756,11 +7754,9 @@
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_TLLA:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_ADVERTISEMENT:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_SOLICITATION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NS_HEADER_LEN:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_RA_HEADER_LEN:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ROUTER_ADVERTISEMENT:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ROUTER_SOLICITATION:I,blocked
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_RS_HEADER_LEN:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->INFINITE_LEASE:I,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_ALL:Ljava/net/Inet4Address;,blocked
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_ANY:Ljava/net/Inet4Address;,blocked
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 27ee353..f43b0f7 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,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$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;->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,1062,5,1062,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/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,
@@ -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,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/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/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/hiddenapi/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index bd44b6e..4f61f16 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv
@@ -1363,7 +1363,6 @@
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
@@ -7501,7 +7500,6 @@
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
@@ -7712,6 +7710,7 @@
Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VEHICLE_INTERNAL:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->NET_CAPABILITY_VSIM:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->RESTRICTED_CAPABILITIES:J
+Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->TRANSPORT_USB:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->UNRESTRICTED_CAPABILITIES:J
Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->getDisplayTransport([I)I
Lcom/android/wifi/x/com/android/net/module/util/NetworkCapabilitiesUtils;->inferRestrictedCapability(Landroid/net/NetworkCapabilities;)Z
@@ -7745,7 +7744,6 @@
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ECHO_REPLY_TYPE:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ECHO_REQUEST_TYPE:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_HEADER_MIN_LEN:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NA_HEADER_LEN:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_LENGTH_SCALING_FACTOR:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MIN_LENGTH:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_MTU:I
@@ -7756,11 +7754,9 @@
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ND_OPTION_TLLA:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_ADVERTISEMENT:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NEIGHBOR_SOLICITATION:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_NS_HEADER_LEN:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_RA_HEADER_LEN:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ROUTER_ADVERTISEMENT:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_ROUTER_SOLICITATION:I
-Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->ICMPV6_RS_HEADER_LEN:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->INFINITE_LEASE:I
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_ALL:Ljava/net/Inet4Address;
Lcom/android/wifi/x/com/android/net/module/util/NetworkStackConstants;->IPV4_ADDR_ANY:Ljava/net/Inet4Address;
diff --git a/current/sdk_library/module-lib/framework-wifi_annotations.zip b/current/sdk_library/module-lib/framework-wifi_annotations.zip
index 68ea3ac..1f991a5 100644
--- a/current/sdk_library/module-lib/framework-wifi_annotations.zip
+++ b/current/sdk_library/module-lib/framework-wifi_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/framework-wifi-stubs.jar b/current/sdk_library/public/framework-wifi-stubs.jar
index 41bcc6d..59457f8 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 71c6c71..feb5088 100644
--- a/current/sdk_library/public/framework-wifi.srcjar
+++ b/current/sdk_library/public/framework-wifi.srcjar
Binary files differ
diff --git a/current/sdk_library/public/framework-wifi_annotations.zip b/current/sdk_library/public/framework-wifi_annotations.zip
index 80b245b..f9fc82c 100644
--- a/current/sdk_library/public/framework-wifi_annotations.zip
+++ b/current/sdk_library/public/framework-wifi_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/framework-wifi_annotations.zip b/current/sdk_library/system/framework-wifi_annotations.zip
index 68ea3ac..1f991a5 100644
--- a/current/sdk_library/system/framework-wifi_annotations.zip
+++ b/current/sdk_library/system/framework-wifi_annotations.zip
Binary files differ