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

Commit 3491e579 authored by Ajay Panicker's avatar Ajay Panicker
Browse files

Use the wrapped volume interface with the AVRCP conneciton handler 

Use the wrapped volume interface in connection handler so that JNI calls
are automatically executed on the correct thread when called from the
connection handler.

Bug: 30602783
Test: Connect a device that doesn't support absolute volume and see that
the JNI call doesn't throw an exception.

Change-Id: Ife768c715022e70dd4055270c1d6cf76ba26aea3
parent 37d7e9c1

system/btif/avrcp/avrcp_service.cc

+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();

}