Snap for 11227258 from 081ccd0011 to 24D1-release

Change-Id: Icd08ebf5c592b5b16e1d41903dc6b62c6b4bc48c
This commit is contained in:
Android Build Coastguard Worker 2023-12-16 04:17:55 +00:00
commit ebab213ee9
3 changed files with 29 additions and 21 deletions

View file

@ -121,10 +121,10 @@ typedef struct {
/* RTT configuration v3 (11az support)*/
typedef struct {
wifi_rtt_config rtt_config;
int ntb_min_measurement_time_millis; // 11az Non-Trigger-based (non-TB) minimum measurement
// time in milliseconds
int ntb_max_measurement_time_millis; // 11az Non-Trigger-based (non-TB) maximum measurement
// time in milliseconds
u64 ntb_min_measurement_time; // 11az Non-Trigger-based (non-TB) minimum measurement time in
// units of 100 microseconds
u64 ntb_max_measurement_time; // 11az Non-Trigger-based (non-TB) maximum measurement time in
// units of 10 milliseconds
} wifi_rtt_config_v3;
/* RTT results */
@ -182,16 +182,17 @@ typedef struct {
/* RTT results v3 (11az support)*/
typedef struct {
wifi_rtt_result_v2 rtt_result;
byte i2r_tx_ltf_repetition_count; // Multiple transmissions of HE-LTF symbols in an HE (I2R)
// Ranging NDP. An HE-LTF repetition value of 1 indicates no
// repetitions.
byte r2i_tx_ltf_repetition_count; // Multiple transmissions of HE-LTF symbols in an HE (R2I)
// Ranging NDP. An HE-LTF repetition value of 1 indicates no
// repetitions.
int ntb_min_measurement_time_millis; // Minimum non-trigger based (non-TB) dynamic measurement
// time in milliseconds assigned by the 11az responder.
int ntb_max_measurement_time_millis; // Maximum non-trigger based (non-TB) dynamic measurement
// time in milliseconds assigned by the 11az responder.
byte i2r_tx_ltf_repetition_count;// Multiple transmissions of HE-LTF symbols in an HE (I2R)
// Ranging NDP. An HE-LTF repetition value of 1 indicates no
// repetitions.
byte r2i_tx_ltf_repetition_count;// Multiple transmissions of HE-LTF symbols in an HE (R2I)
// Ranging NDP. An HE-LTF repetition value of 1 indicates no
// repetitions.
u64 ntb_min_measurement_time; // Minimum non-trigger based (non-TB) dynamic measurement time
// in units of 100 microseconds assigned by the 11az responder.
u64 ntb_max_measurement_time; // Maximum non-trigger based (non-TB) dynamic measurement
// time in units of 10 milliseconds assigned by the 11az
// responder.
} wifi_rtt_result_v3;

View file

@ -31,8 +31,8 @@ typedef struct {
u8 is_flexible_twt_supported; // 0 for not supporting flexible twt schedules
u32 min_wake_duration_micros; // minimum twt wake duration capable in microseconds
u32 max_wake_duration_micros; // maximum twt wake duration capable in microseconds
u32 min_wake_interval_micros; // minimum twt wake interval capable in microseconds
u32 max_wake_interval_micros; // maximum twt wake interval capable in microseconds
u64 min_wake_interval_micros; // minimum twt wake interval capable in microseconds
u64 max_wake_interval_micros; // maximum twt wake interval capable in microseconds
} wifi_twt_capabilities;
/* TWT request parameters to setup or update a TWT session */
@ -41,8 +41,8 @@ typedef struct {
// Otherwise UNSPECIFIED.
u32 min_wake_duration_micros; // minimum twt wake duration in microseconds
u32 max_wake_duration_micros; // maximum twt wake duration in microseconds
u32 min_wake_interval_micros; // minimum twt wake interval in microseconds
u32 max_wake_interval_micros; // maximum twt wake interval in microseconds
u64 min_wake_interval_micros; // minimum twt wake interval in microseconds
u64 max_wake_interval_micros; // maximum twt wake interval in microseconds
} wifi_twt_request;
/* TWT negotiation types */
@ -56,7 +56,7 @@ typedef struct {
u32 session_id; // a unique identifier for the session
s8 mlo_link_id; // link id in case of MLO connection. Otherwise UNSPECIFIED.
u32 wake_duration_micros; // TWT service period in microseconds
u32 wake_interval_micros; // TWT wake interval for this session in microseconds
u64 wake_interval_micros; // TWT wake interval for this session in microseconds
wifi_twt_negotiation_type negotiation_type; // TWT negotiation type
u8 is_trigger_enabled; // 0 if this TWT session is not trigger enabled
u8 is_announced; // 0 if this TWT session is not announced

View file

@ -40,8 +40,15 @@ static std::unordered_map<std::string, std::shared_ptr<IWakeLock>> gWakeLockMap;
static const std::shared_ptr<ISystemSuspend> getSystemSuspendServiceOnce() {
static std::shared_ptr<ISystemSuspend> suspendService =
ISystemSuspend::fromBinder(ndk::SpAIBinder(AServiceManager_waitForService(
(ISystemSuspend::descriptor + std::string("/default")).c_str())));
[]() -> std::shared_ptr<ISystemSuspend> {
std::string suspendServiceName =
ISystemSuspend::descriptor + std::string("/default");
if (!AServiceManager_isDeclared(suspendServiceName.c_str())) {
return nullptr;
}
return ISystemSuspend::fromBinder(ndk::SpAIBinder(
AServiceManager_waitForService(suspendServiceName.c_str())));
}();
return suspendService;
}