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

Commit db5c399a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add missing return and test for volume check" am: 5872e77c am:... 

Merge "Add missing return and test for volume check" am: 5872e77c am: 15574e53 am: 339e23a5 am: 235f958b

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1832935

Change-Id: I857b68a317c1186cc3f4d26b66a51c3e74872017
parents 6a7da4b9 235f958b

system/profile/avrcp/device.cc

+3 −2
Original line number Diff line number Diff line
@@ -414,8 +414,9 @@ void Device::SetVolume(int8_t volume) { 
  // TODO (apanicke): Implement logic for Multi-AVRCP

  DEVICE_VLOG(1) << __func__ << ": volume=" << (int)volume;

  if (volume == volume_) {

    DEVICE_VLOG(3) << __func__

                   << ": Ignoring volume change same as current volume level";

    DEVICE_LOG(WARNING)

        << __func__ << ": Ignoring volume change same as current volume level";

    return;

  }

  auto request = SetAbsoluteVolumeRequestBuilder::MakeBuilder(volume);

system/profile/avrcp/tests/avrcp_device_test.cc

+13 −0
Original line number Diff line number Diff line
@@ -1351,6 +1351,19 @@ TEST_F(AvrcpDeviceTest, volumeRejectedTest) { 
  EXPECT_CALL(response_cb, Call(_, _, _)).Times(0);

}



TEST_F(AvrcpDeviceTest, setVolumeOnceTest) {

  int vol = 0x48;



  auto set_abs_vol = SetAbsoluteVolumeRequestBuilder::MakeBuilder(vol);



  // Ensure that SetVolume only been call once.

  EXPECT_CALL(response_cb, Call(_, false, matchPacket(std::move(set_abs_vol))))

      .Times(1);



  test_device->SetVolume(vol);

  test_device->SetVolume(vol);

}



TEST_F(AvrcpDeviceTest, playPushedActiveDeviceTest) {

  MockMediaInterface interface;

  NiceMock<MockA2dpInterface> a2dp_interface;