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

Commit 7fb1b2ee authored by Ajay Panicker's avatar Ajay Panicker Committed by Android (Google) Code Review
Browse files

Merge "Use the wrapped volume interface with the AVRCP conneciton handler" into pi-dev

parents 2489fe07 f6f1625f
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();
}