DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: Iee54a2d226deff786a190480b6ca1d6f7424992c
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 22be7bf..c0063b2 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -30,9 +30,6 @@
<!-- Separate software navigation bar required on this device. -->
<bool name="config_showNavigationBar">true</bool>
- <!-- Integer indicating the framework scan interval in milliseconds. -->
- <integer translatable="false" name="config_wifi_framework_scan_interval">10000</integer>
-
<!-- XXXXX NOTE THE FOLLOWING RESOURCES USE THE WRONG NAMING CONVENTION.
Please don't copy them, copy anything else. -->
diff --git a/wifi/wifi_hal/wifi_offload.cpp b/wifi/wifi_hal/wifi_offload.cpp
index 9ef1912..99c2fec 100644
--- a/wifi/wifi_hal/wifi_offload.cpp
+++ b/wifi/wifi_hal/wifi_offload.cpp
@@ -216,7 +216,8 @@
/* API to send specified mkeep_alive packet periodically. */
wifi_error wifi_start_sending_offloaded_packet(wifi_request_id index, wifi_interface_handle iface,
- u8 *ip_packet, u16 ip_packet_len, u8 *src_mac_addr, u8 *dst_mac_addr, u32 period_msec)
+ u16 /* ether_type */, u8 *ip_packet, u16 ip_packet_len, u8 *src_mac_addr, u8 *dst_mac_addr,
+ u32 period_msec)
{
if ((index > 0 && index <= N_AVAIL_ID) && (ip_packet != NULL) && (src_mac_addr != NULL)
&& (dst_mac_addr != NULL) && (period_msec > 0)
