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

Commit 96a4d885 authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Use the wrapped volume interface with the AVRCP conneciton handler"

am: 8ff841d0

Change-Id: I4016ab7a8121cf626f35a7ceda094258ecb01d61
parents d3499323 8ff841d0
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -273,13 +273,16 @@ void AvrcpService::Init(MediaInterface* media_interface,
  instance_->media_interface_ = new MediaInterfaceWrapper(media_interface);
  media_interface->RegisterUpdateCallback(instance_);

  VolumeInterfaceWrapper* wrapped_volume_interface = nullptr;
  if (volume_interface != nullptr) {
    instance_->volume_interface_ = new VolumeInterfaceWrapper(volume_interface);
    wrapped_volume_interface = new VolumeInterfaceWrapper(volume_interface);
  }

  instance_->volume_interface_ = wrapped_volume_interface;

  ConnectionHandler::Initialize(
      base::Bind(&AvrcpService::DeviceCallback, base::Unretained(instance_)),
      &avrcp_interface_, &sdp_interface_, volume_interface);
      &avrcp_interface_, &sdp_interface_, wrapped_volume_interface);
  instance_->connection_handler_ = ConnectionHandler::Get();
}