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

Commit 10923d58 authored by Jakub Tyszkowski's avatar Jakub Tyszkowski
Browse files

broadcast: Fix address type in the advertising 

Bug: 150670922
Sponsor: jpawlowski@
Test: atest --host bluetooth_test_broadcaster_sm --no-bazel-mode
Change-Id: I02e35e94ae903d43d1a9d00fe4301939cd8db005
parent 82652387

system/bta/le_audio/broadcaster/state_machine.cc

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ class BroadcastStateMachineImpl : public BroadcastStateMachine { 
      adv_params.primary_advertising_phy = PHY_LE_1M;

      adv_params.secondary_advertising_phy = streaming_phy;

      adv_params.scan_request_notification_enable = 0;

      adv_params.own_address_type = BLE_ADDR_RANDOM;



      periodic_params.max_interval = BroadcastStateMachine::kPaIntervalMax;

      periodic_params.min_interval = BroadcastStateMachine::kPaIntervalMin;

system/bta/le_audio/broadcaster/state_machine_test.cc

+8 −2
Original line number Diff line number Diff line
@@ -856,12 +856,13 @@ TEST_F(StateMachineTest, GetBroadcastAnnouncement) { 
            broadcasts_[broadcast_id]->GetBroadcastAnnouncement());

}



TEST_F(StateMachineTest, AnnouncementUUIDs) {

TEST_F(StateMachineTest, AnnouncementTest) {

  tBTM_BLE_ADV_PARAMS adv_params;

  std::vector<uint8_t> a_data;

  std::vector<uint8_t> p_data;



  EXPECT_CALL(*mock_ble_advertising_manager_, StartAdvertisingSet)

      .WillOnce([&p_data, &a_data](

      .WillOnce([&p_data, &a_data, &adv_params](

                    base::Callback<void(uint8_t, int8_t, uint8_t)> cb,

                    tBTM_BLE_ADV_PARAMS* params,

                    std::vector<uint8_t> advertise_data,
@@ -879,6 +880,8 @@ TEST_F(StateMachineTest, AnnouncementUUIDs) { 
        a_data = std::move(advertise_data);

        p_data = std::move(periodic_data);



        adv_params = *params;



        cb.Run(advertiser_id, tx_power, status);

      });
@@ -900,6 +903,9 @@ TEST_F(StateMachineTest, AnnouncementUUIDs) { 
  ASSERT_EQ(p_data[1], 0x16);  // BTM_BLE_AD_TYPE_SERVICE_DATA_TYPE

  ASSERT_EQ(p_data[2], (kBasicAudioAnnouncementServiceUuid & 0x00FF));

  ASSERT_EQ(p_data[3], ((kBasicAudioAnnouncementServiceUuid >> 8) & 0x00FF));



  // Check advertising parameters

  ASSERT_EQ(adv_params.own_address_type, BLE_ADDR_RANDOM);

}



}  // namespace