Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b65fd00e authored by Eric Shih's avatar Eric Shih Committed by Automerger Merge Worker
Browse files

Merge "Assign default value for stack_power_telemetry" into main am: 9b30d4e9 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3009074



Change-Id: Ie760f5196d4788e5828ebc19253f030789630b21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6245912 9b30d4e9

system/osi/src/stack_power_telemetry.cc

+7 −7
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ ChannelType PsmToChannelType(const uint16_t& psm) { 
}



struct Duration {

  time_t begin;

  time_t end;

  time_t begin = 0;

  time_t end = 0;

};



struct DataTransfer {
@@ -90,14 +90,14 @@ struct DataTransfer { 
};



struct LinkDetails {

  RawAddress bd_addr;

  RawAddress bd_addr = RawAddress::kEmpty;

  uint16_t handle = 0;

  Duration duration;

  uint8_t tx_power_level = 0;

};



struct ChannelDetails {

  RawAddress bd_addr;

  RawAddress bd_addr = RawAddress::kEmpty;

  int32_t psm = 0;

  struct {

    uint16_t cid = 0;
@@ -107,7 +107,7 @@ struct ChannelDetails { 
  DataTransfer data_transfer;

  Duration duration;

  struct {

    time_t last_data_sent;

    time_t last_data_sent = 0;

  } rx, tx;

};
@@ -127,7 +127,7 @@ struct ScanDetails { 
};



struct SniffData {

  RawAddress bd_addr;

  RawAddress bd_addr = RawAddress::kEmpty;

  uint32_t sniff_count = 0, active_count = 0;

  time_t sniff_duration_ts = 0, active_duration_ts = 0;

  time_t last_mode_change_ts = get_current_time();
@@ -192,7 +192,7 @@ struct power_telemetry::PowerTelemetryImpl { 
  } rx, tx;



  struct {

    uint16_t count_;

    uint16_t count_ = 0;

  } scan, inq_scan, ble_adv, ble_scan;



  struct {