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

Commit a2594730 authored by Zach Johnson's avatar Zach Johnson
Browse files

Encapsulate energy_info_cb 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia4226c94a1b7651fb491ebf71d96b183d5d5796a
parent 34e5dc88

system/btif/include/btif_common.h

+2 −0
Original line number Diff line number Diff line
@@ -215,5 +215,7 @@ void invoke_acl_state_changed_cb(bt_status_t status, RawAddress bd_addr, 
                                 bt_acl_state_t state);

void invoke_thread_evt_cb(bt_cb_thread_evt event);

void invoke_le_test_mode_cb(bt_status_t status, uint16_t count);

void invoke_energy_info_cb(bt_activity_energy_info energy_info,

                           bt_uid_traffic_t* uid_data);



#endif /* BTIF_COMMON_H */

system/btif/src/bluetooth.cc

+13 −0
Original line number Diff line number Diff line
@@ -743,3 +743,16 @@ void invoke_le_test_mode_cb(bt_status_t status, uint16_t count) { 
                                  },

                                  status, count));

}



// takes ownership of |uid_data|

void invoke_energy_info_cb(bt_activity_energy_info energy_info,

                           bt_uid_traffic_t* uid_data) {

  do_in_jni_thread(

      FROM_HERE,

      base::BindOnce(

          [](bt_activity_energy_info energy_info, bt_uid_traffic_t* uid_data) {

            HAL_CBACK(bt_hal_cbacks, energy_info_cb, &energy_info, uid_data);

            osi_free(uid_data);

          },

          energy_info, uid_data));

}

system/btif/src/btif_dm.cc

+1 −2
Original line number Diff line number Diff line
@@ -1939,8 +1939,7 @@ static void btif_dm_upstreams_evt(uint16_t event, char* p_param) { 
      energy_info.energy_used = p_ener_data->energy_used;



      bt_uid_traffic_t* data = uid_set_read_and_clear(uid_set);

      HAL_CBACK(bt_hal_cbacks, energy_info_cb, &energy_info, data);

      osi_free(data);

      invoke_energy_info_cb(energy_info, data);

      break;

    }