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

Commit f7bf63c1 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

Merge "vc: Fix null pointer dereference" into main am: fa5781a4 

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



Change-Id: I74f186b5fde8633a526caf7b9c144a61e20b4edf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b291182 fa5781a4

system/bta/vc/types.h

+6 −0
Original line number Diff line number Diff line
@@ -89,6 +89,12 @@ struct VolumeOperation { 
  };



  ~VolumeOperation() {

    if (operation_timeout_ == nullptr) {

      log::warn("operation_timeout_ should not be null, id {}, device cnt {}",

                operation_id_, devices_.size());

      return;

    }



    if (alarm_is_scheduled(operation_timeout_))

      alarm_cancel(operation_timeout_);

system/bta/vc/vc.cc

+2 −0
Original line number Diff line number Diff line
@@ -681,6 +681,8 @@ class VolumeControlImpl : public VolumeControl { 
      return;

    }



    log::info("{}", remote_bda);



    bool notify = device->IsReady() || device->connecting_actively;

    device_cleanup_helper(device, notify);