Merge "DO NOT MERGE - Merge Android 10 into master"

This commit is contained in:
Xin Li 2019-09-05 16:53:35 +00:00 committed by Gerrit Code Review
commit 8eb6e081d4
4 changed files with 38 additions and 7 deletions

View file

@ -338,9 +338,6 @@ public:
static bool isBluetoothScoDevice(audio_devices device) {
return audio_is_bluetooth_sco_device((audio_devices_t)device);
}
static bool isLowVisibility(stream_type stream) {
return audio_is_low_visibility((audio_stream_type_t)stream);
}
static bool isValidFormat(uint32_t format) {
return audio_is_valid_format((audio_format_t) format);
}

View file

@ -40,13 +40,21 @@ typedef enum {
/* Pre selected Power scenarios to be applied from BDF file */
typedef enum {
WIFI_POWER_SCENARIO_INVALID = -2,
WIFI_POWER_SCENARIO_DEFAULT = -1,
WIFI_POWER_SCENARIO_VOICE_CALL = 0,
WIFI_POWER_SCENARIO_ON_HEAD_CELL_OFF = 1,
WIFI_POWER_SCENARIO_ON_HEAD_CELL_ON = 2,
WIFI_POWER_SCENARIO_ON_BODY_CELL_OFF = 3,
WIFI_POWER_SCENARIO_ON_BODY_CELL_ON = 4,
WIFI_POWER_SCENARIO_ON_BODY_BT = 5,
} wifi_power_scenario;
typedef enum {
WIFI_LATENCY_MODE_NORMAL = 0,
WIFI_LATENCY_MODE_LOW = 1,
} wifi_latency_mode;
/*
* enum wlan_mac_band - Band information corresponding to the WLAN MAC.
*/
@ -153,6 +161,8 @@ void wifi_get_error_info(wifi_error err, const char **msg); // return a pointer
#define WIFI_FEATURE_SCAN_RAND 0x2000000 // Support MAC & Probe Sequence Number randomization
#define WIFI_FEATURE_SET_TX_POWER_LIMIT 0x4000000 // Support Tx Power Limit setting
#define WIFI_FEATURE_USE_BODY_HEAD_SAR 0x8000000 // Support Using Body/Head Proximity for SAR
#define WIFI_FEATURE_SET_LATENCY_MODE 0x40000000 // Support Latency mode setting
#define WIFI_FEATURE_P2P_RAND_MAC 0x80000000 // Support Support P2P MAC randomization
// Add more features here
@ -215,6 +225,7 @@ wifi_error wifi_reset_iface_event_handler(wifi_request_id id, wifi_interface_han
wifi_error wifi_set_nodfs_flag(wifi_interface_handle handle, u32 nodfs);
wifi_error wifi_select_tx_power_scenario(wifi_interface_handle handle, wifi_power_scenario scenario);
wifi_error wifi_reset_tx_power_scenario(wifi_interface_handle handle);
wifi_error wifi_set_latency_mode(wifi_interface_handle handle, wifi_latency_mode mode);
typedef struct rx_data_cnt_details_t {
int rx_unicast_cnt; /*Total rx unicast packet which woke up host */
@ -357,8 +368,9 @@ typedef struct {
wifi_error (*wifi_set_lcr) (wifi_request_id id, wifi_interface_handle iface,
wifi_lcr_information *lcr);
wifi_error (*wifi_start_sending_offloaded_packet)(wifi_request_id id,
wifi_interface_handle iface, u8 *ip_packet, u16 ip_packet_len,
u8 *src_mac_addr, u8 *dst_mac_addr, u32 period_msec);
wifi_interface_handle iface, u16 ether_type, u8 *ip_packet,
u16 ip_packet_len, u8 *src_mac_addr, u8 *dst_mac_addr,
u32 period_msec);
wifi_error (*wifi_stop_sending_offloaded_packet)(wifi_request_id id,
wifi_interface_handle iface);
wifi_error (*wifi_start_rssi_monitoring)(wifi_request_id id, wifi_interface_handle
@ -464,6 +476,8 @@ typedef struct {
wifi_roaming_config *roaming_config);
wifi_error (*wifi_set_radio_mode_change_handler)(wifi_request_id id, wifi_interface_handle
iface, wifi_radio_mode_change_handler eh);
wifi_error (*wifi_set_latency_mode)(wifi_interface_handle iface,
wifi_latency_mode mode);
} wifi_hal_fn;
wifi_error init_wifi_vendor_hal_func_table(wifi_hal_fn *fn);
#ifdef __cplusplus

View file

@ -42,7 +42,7 @@ typedef u32 NanDataPathId;
#define NAN_MAC_ADDR_LEN 6
#define NAN_MAJOR_VERSION 2
#define NAN_MINOR_VERSION 0
#define NAN_MICRO_VERSION 0
#define NAN_MICRO_VERSION 1
#define NAN_MAX_SOCIAL_CHANNELS 3
/* NAN Maximum Lengths */
@ -388,6 +388,7 @@ typedef struct {
bool is_ndp_security_supported;
u32 max_sdea_service_specific_info_len;
u32 max_subscribe_address;
u32 ndpe_attr_supported;
} NanCapabilities;
/*
@ -1023,6 +1024,15 @@ typedef struct {
*/
u8 config_dw_early_termination;
u32 enable_dw_termination;
/*
Indicate whether to use NDPE attribute to bring-up TCP/IP connection.
If config_ndpe_attr is not configured, the default behavior is
not using NDPE attr, and the capability is not advertised.
0 - Not use
1 - Use
*/
u8 config_ndpe_attr;
u32 use_ndpe_attr;
} NanEnableRequest;
/*
@ -1499,6 +1509,15 @@ typedef struct {
*/
u8 config_dw_early_termination;
u32 enable_dw_termination;
/*
Indicate whether to use NDPE attribute to bring-up TCP/IP connection
If config_ndpe_attr is not configured, the default behavior is
not using NDPE attr, and the capability is not advertised.
0 - Not use
1 - Use
*/
u8 config_ndpe_attr;
u32 use_ndpe_attr;
} NanConfigRequest;
/*

View file

@ -16,7 +16,8 @@ extern "C"
* Send specified keep alive packet periodically.
*/
wifi_error wifi_start_sending_offloaded_packet(wifi_request_id id, 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);
/**
* Stop sending keep alive packet.