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

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

Merge "vc: Fix operation removal on Write Error response" into main am: 254f6195 

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



Change-Id: I3c3b9ceeb90e1a781009794ee8af0f8125c41c8e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2e3861a 254f6195

system/bta/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ cc_test { 
    ],

    srcs: [

        ":TestCommonMockFunctions",

        ":TestMockOsi",

        ":TestStubOsi",

        "gatt/database.cc",

        "gatt/database_builder.cc",

        "test/common/bta_gatt_api_mock.cc",

system/bta/vc/vc.cc

+2 −1
Original line number Diff line number Diff line
@@ -815,7 +815,8 @@ class VolumeControlImpl : public VolumeControl { 
                       INT_TO_PTR(op->operation_id_));

    devices_control_point_helper(

        op->devices_, op->opcode_,

        op->arguments_.size() == 0 ? nullptr : &(op->arguments_));

        op->arguments_.size() == 0 ? nullptr : &(op->arguments_),

        op->operation_id_);

  }



  void CancelVolumeOperation(int operation_id) {

system/bta/vc/vc_test.cc

+29 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "hardware/bt_gatt_types.h"

#include "mock_csis_client.h"

#include "stack/include/bt_uuid16.h"

#include "test/common/mock_functions.h"

#include "types.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"
@@ -245,6 +246,7 @@ class VolumeControlTest : public ::testing::Test { 
    gatt::SetMockBtaGattInterface(&gatt_interface);

    gatt::SetMockBtaGattQueue(&gatt_queue);

    callbacks.reset(new MockVolumeControlCallbacks());

    reset_mock_function_count_map();



    ON_CALL(btm_interface, IsLinkKeyKnown(_, _))

        .WillByDefault(DoAll(Return(true)));
@@ -1231,6 +1233,33 @@ class VolumeControlValueSetTest : public VolumeControlTest { 
  }

};



TEST_F(VolumeControlValueSetTest, test_volume_operation_failed) {

  const std::vector<uint8_t> vol_x10({0x04, 0x00, 0x10});

  EXPECT_CALL(gatt_queue,

              WriteCharacteristic(conn_id, 0x0024, vol_x10, GATT_WRITE, _, _))

      .Times(1);

  ON_CALL(gatt_queue, WriteCharacteristic(_, _, _, _, _, _))

      .WillByDefault(

          Invoke([this](uint16_t conn_id, uint16_t handle,

                        std::vector<uint8_t> value, tGATT_WRITE_TYPE write_type,

                        GATT_WRITE_OP_CB cb, void* cb_data) {

            auto* svc = gatt::FindService(services_map[conn_id], handle);

            if (svc == nullptr) return;



            tGATT_STATUS status = GATT_ERROR;

            if (cb)

              cb(conn_id, status, handle, value.size(), value.data(), cb_data);

          }));

  ASSERT_EQ(0, get_func_call_count("alarm_set_on_mloop"));

  ASSERT_EQ(0, get_func_call_count("alarm_cancel"));



  VolumeControl::Get()->SetVolume(test_address, 0x10);

  Mock::VerifyAndClearExpectations(&gatt_queue);



  ASSERT_EQ(1, get_func_call_count("alarm_set_on_mloop"));

  ASSERT_EQ(1, get_func_call_count("alarm_cancel"));

}



TEST_F(VolumeControlValueSetTest, test_set_volume) {

  const std::vector<uint8_t> vol_x10({0x04, 0x00, 0x10});

  EXPECT_CALL(gatt_queue,