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

Commit e07ce4f2 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski
Browse files

leaudio: Minor cleanup 

Avoid this warinig
system/bta/le_audio/state_machine.cc:137:  You seem to be initializing a member variable with itself.  [runtime/init] [4]

Bug: 331775328
Flag: Exempt, mechanical change.
Test: atest bluetooth_le_audio_test
Change-Id: Ic0dffd527b796cb9fda02f6b5c59a035dc547f62
parent 472ac7e7

system/bta/le_audio/client.cc

+4 −4
Original line number Diff line number Diff line
@@ -233,11 +233,11 @@ public: 
    alarm_free(suspend_timeout_);

  }



  LeAudioClientImpl(bluetooth::le_audio::LeAudioClientCallbacks* callbacks_,

                    LeAudioGroupStateMachine::Callbacks* state_machine_callbacks_,

  LeAudioClientImpl(bluetooth::le_audio::LeAudioClientCallbacks* callbacks,

                    LeAudioGroupStateMachine::Callbacks* state_machine_callbacks,

                    base::Closure initCb)

      : gatt_if_(0),

        callbacks_(callbacks_),

        callbacks_(callbacks),

        active_group_id_(bluetooth::groups::kGroupUnknown),

        configuration_context_type_(LeAudioContextType::UNINITIALIZED),

        in_call_metadata_context_types_({.sink = AudioContexts(), .source = AudioContexts()}),
@@ -256,7 +256,7 @@ public: 
        close_vbc_timeout_(alarm_new("LeAudioCloseVbcTimeout")),

        suspend_timeout_(alarm_new("LeAudioSuspendTimeout")),

        disable_timer_(alarm_new("LeAudioDisableTimer")) {

    LeAudioGroupStateMachine::Initialize(state_machine_callbacks_);

    LeAudioGroupStateMachine::Initialize(state_machine_callbacks);

    groupStateMachine_ = LeAudioGroupStateMachine::Get();



    log::info("Reconnection mode: TARGETED_ANNOUNCEMENTS");

system/bta/le_audio/state_machine.cc

+2 −2
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ LeAudioGroupStateMachineImpl* instance; 


class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine {

public:

  LeAudioGroupStateMachineImpl(Callbacks* state_machine_callbacks_)

      : state_machine_callbacks_(state_machine_callbacks_),

  LeAudioGroupStateMachineImpl(Callbacks* state_machine_callbacks)

      : state_machine_callbacks_(state_machine_callbacks),

        watchdog_(alarm_new("LeAudioStateMachineTimer")) {

    log_history_ = LeAudioLogHistory::Get();

  }