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

Commit a4fd5a0e authored by David Duarte's avatar David Duarte
Browse files

LE Audio: Replace invalid VolumeControl::Get use by IsVolumeControlRunning 

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

Change-Id: Ife3edd2545c0740fe948f2ea851ee4f1ed1b2177
Test: TreeHugger
parent bf93ee1c

system/btif/src/btif_vc.cc

+13 −13
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ class VolumeControlInterfaceImpl : public VolumeControlInterface, 
  void Connect(const RawAddress& address) override {

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



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

    if (!initialized || !VolumeControl::IsVolumeControlRunning()) {

      DVLOG(2) << __func__

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

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

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



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

    if (!initialized || !VolumeControl::IsVolumeControlRunning()) {

      DVLOG(2) << __func__

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

                  "service being not read";
@@ -160,7 +160,7 @@ class VolumeControlInterfaceImpl : public VolumeControlInterface, 
                 uint8_t volume) override {

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



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

    if (!initialized || !VolumeControl::IsVolumeControlRunning()) {

      DVLOG(2) << __func__

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

                  "service being not read";
@@ -175,7 +175,7 @@ class VolumeControlInterfaceImpl : public VolumeControlInterface, 
  void Mute(std::variant<RawAddress, int> addr_or_group_id) override {

    DVLOG(2) << __func__;



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

    if (!initialized || !VolumeControl::IsVolumeControlRunning()) {

      DVLOG(2) << __func__

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

                  "service being not read";
@@ -190,7 +190,7 @@ class VolumeControlInterfaceImpl : public VolumeControlInterface, 
  void Unmute(std::variant<RawAddress, int> addr_or_group_id) override {

    DVLOG(2) << __func__;



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

    if (!initialized || !VolumeControl::IsVolumeControlRunning()) {

      DVLOG(2) << __func__

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

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

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



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

    if (!initialized || !VolumeControl::IsVolumeControlRunning()) {

      DVLOG(2) << __func__

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

                  "service being not read";
@@ -227,7 +227,7 @@ class VolumeControlInterfaceImpl : public VolumeControlInterface, 
    DVLOG(2) << __func__ << " address: " << address

             << "ext_output_id:" << ext_output_id;



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

    if (!initialized || !VolumeControl::IsVolumeControlRunning()) {

      DVLOG(2) << __func__

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

                  "service being not read";
@@ -247,7 +247,7 @@ class VolumeControlInterfaceImpl : public VolumeControlInterface, 
             << "ext_output_id:" << ext_output_id

             << "ext_output_id:" << offset_val;



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

    if (!initialized || !VolumeControl::IsVolumeControlRunning()) {

      DVLOG(2) << __func__

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

                  "service being not read";
@@ -265,7 +265,7 @@ class VolumeControlInterfaceImpl : public VolumeControlInterface, 
    DVLOG(2) << __func__ << " address: " << address

             << "ext_output_id:" << ext_output_id;



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

    if (!initialized || !VolumeControl::IsVolumeControlRunning()) {

      DVLOG(2) << __func__

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

                  "service being not read";
@@ -283,7 +283,7 @@ class VolumeControlInterfaceImpl : public VolumeControlInterface, 
             << "ext_output_id:" << ext_output_id

             << "location:" << loghex(location);



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

    if (!initialized || !VolumeControl::IsVolumeControlRunning()) {

      DVLOG(2) << __func__

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

                  "service being not read";
@@ -300,7 +300,7 @@ class VolumeControlInterfaceImpl : public VolumeControlInterface, 
    DVLOG(2) << __func__ << " address: " << address

             << "ext_output_id:" << ext_output_id;



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

    if (!initialized || !VolumeControl::IsVolumeControlRunning()) {

      DVLOG(2) << __func__

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

                  "service being not read";
@@ -318,7 +318,7 @@ class VolumeControlInterfaceImpl : public VolumeControlInterface, 
    DVLOG(2) << __func__ << " address: " << address

             << "ext_output_id:" << ext_output_id << "description:" << descr;



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

    if (!initialized || !VolumeControl::IsVolumeControlRunning()) {

      DVLOG(2) << __func__

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

                  "service being not read";
@@ -332,7 +332,7 @@ class VolumeControlInterfaceImpl : public VolumeControlInterface, 


  void Cleanup(void) override {

    DVLOG(2) << __func__;

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

    if (!initialized || !VolumeControl::IsVolumeControlRunning()) {

      DVLOG(2) << __func__

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

                  "service being not read";