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

Commit 69d929d4 authored by David Duarte's avatar David Duarte
Browse files

LE Audio: Replace invalid LeAudioClient::Get use by IsLeAudioClientRunning 

LeAudioClient::Get asserts if the instance is null,
comparing it to nullptr is invalid as this case is imposible.
Use LeAudioClient::IsLeAudioClientRunning that do the proper check instead.

Test: TreeHugger
Fix: 269189182
Change-Id: I295230d0f634cbf8f78747eb7f1f7abb98ac13b4
parent 3a568ccd

system/btif/src/btif_le_audio.cc

+10 −10
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ class LeAudioClientInterfaceImpl : public LeAudioClientInterface, 


  void Cleanup(void) override {

    DVLOG(2) << __func__;

    if (!initialized || LeAudioClient::Get() == nullptr) {

    if (!initialized || !LeAudioClient::IsLeAudioClientRunning()) {

      DVLOG(2) << __func__

               << " call ignored, due to already started cleanup procedure or "

                  "service being not read";
@@ -153,7 +153,7 @@ class LeAudioClientInterfaceImpl : public LeAudioClientInterface, 
  void RemoveDevice(const RawAddress& address) override {

    DVLOG(2) << __func__ << " address: " << ADDRESS_TO_LOGGABLE_STR(address);



    if (!initialized || LeAudioClient::Get() == nullptr) {

    if (!initialized || !LeAudioClient::IsLeAudioClientRunning()) {

      DVLOG(2) << __func__

               << " call ignored, due to already started cleanup procedure or "

                  "service being not read";
@@ -172,7 +172,7 @@ class LeAudioClientInterfaceImpl : public LeAudioClientInterface, 
  void Connect(const RawAddress& address) override {

    DVLOG(2) << __func__ << " address: " << ADDRESS_TO_LOGGABLE_STR(address);



    if (!initialized || LeAudioClient::Get() == nullptr) {

    if (!initialized || !LeAudioClient::IsLeAudioClientRunning()) {

      DVLOG(2) << __func__

               << " call ignored, due to already started cleanup procedure or "

                  "service being not read";
@@ -187,7 +187,7 @@ class LeAudioClientInterfaceImpl : public LeAudioClientInterface, 
  void Disconnect(const RawAddress& address) override {

    DVLOG(2) << __func__ << " address: " << ADDRESS_TO_LOGGABLE_STR(address);



    if (!initialized || LeAudioClient::Get() == nullptr) {

    if (!initialized || !LeAudioClient::IsLeAudioClientRunning()) {

      DVLOG(2) << __func__

               << " call ignored, due to already started cleanup procedure or "

                  "service being not read";
@@ -203,7 +203,7 @@ class LeAudioClientInterfaceImpl : public LeAudioClientInterface, 
    DVLOG(2) << __func__ << " group_id: " << group_id

             << " address: " << ADDRESS_TO_LOGGABLE_STR(address);



    if (!initialized || LeAudioClient::Get() == nullptr) {

    if (!initialized || !LeAudioClient::IsLeAudioClientRunning()) {

      DVLOG(2) << __func__

               << " call ignored, due to already started cleanup procedure or "

                  "service being not read";
@@ -218,7 +218,7 @@ class LeAudioClientInterfaceImpl : public LeAudioClientInterface, 
  void GroupRemoveNode(const int group_id, const RawAddress& address) override {

    DVLOG(2) << __func__ << " group_id: " << group_id

             << " address: " << ADDRESS_TO_LOGGABLE_STR(address);

    if (!initialized || LeAudioClient::Get() == nullptr) {

    if (!initialized || !LeAudioClient::IsLeAudioClientRunning()) {

      DVLOG(2) << __func__

               << " call ignored, due to already started cleanup procedure or "

                  "service being not read";
@@ -232,7 +232,7 @@ class LeAudioClientInterfaceImpl : public LeAudioClientInterface, 


  void GroupSetActive(const int group_id) override {

    DVLOG(2) << __func__ << " group_id: " << group_id;

    if (!initialized || LeAudioClient::Get() == nullptr) {

    if (!initialized || !LeAudioClient::IsLeAudioClientRunning()) {

      DVLOG(2) << __func__

               << " call ignored, due to already started cleanup procedure or "

                  "service being not read";
@@ -248,7 +248,7 @@ class LeAudioClientInterfaceImpl : public LeAudioClientInterface, 
                                btle_audio_codec_config_t input_codec_config,

                                btle_audio_codec_config_t output_codec_config) {

    DVLOG(2) << __func__ << " group_id: " << group_id;

    if (!initialized || LeAudioClient::Get() == nullptr) {

    if (!initialized || !LeAudioClient::IsLeAudioClientRunning()) {

      DVLOG(2) << __func__

               << " call ignored, due to already started cleanup procedure or "

                  "service being not read";
@@ -263,7 +263,7 @@ class LeAudioClientInterfaceImpl : public LeAudioClientInterface, 
  void SetCcidInformation(int ccid, int context_type) {

    DVLOG(2) << __func__ << " ccid: " << ccid << " context_type"

             << context_type;

    if (!initialized || LeAudioClient::Get() == nullptr) {

    if (!initialized || !LeAudioClient::IsLeAudioClientRunning()) {

      DVLOG(2) << __func__

               << " call ignored, due to already started cleanup procedure or "

                  "service being not read";
@@ -277,7 +277,7 @@ class LeAudioClientInterfaceImpl : public LeAudioClientInterface, 


  void SetInCall(bool in_call) {

    DVLOG(2) << __func__ << " in_call: " << in_call;

    if (!initialized || LeAudioClient::Get() == nullptr) {

    if (!initialized || !LeAudioClient::IsLeAudioClientRunning()) {

      DVLOG(2) << __func__

               << " call ignored, due to already started cleanup procedure or "

                  "service being not read";