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

Commit 2155829d authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Gerrit Code Review
Browse files

Merge "[le audio] Broadcast use non-resolvable address as default" into main

parents 1f86922b 2eccf3ca

system/bta/le_audio/broadcaster/state_machine.cc

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,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;

      adv_params.own_address_type = kBroadcastAdvertisingType;



      periodic_params.max_interval = BroadcastStateMachine::kPaIntervalMax;

      periodic_params.min_interval = BroadcastStateMachine::kPaIntervalMin;

system/bta/le_audio/broadcaster/state_machine.h

+3 −0
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ class BroadcastStateMachine : public StateMachine<5> { 
  // le_advertising_manager will maintain the reg_id together with client_id

  // and java/jni is using negative number

  static constexpr uint8_t kLeAudioBroadcastRegId = 0x1;

  // Matching the ADDRESS_TYPE_* enums from Java

  // ADDRESS_TYPE_RANDOM_NON_RESOLVABLE = 2

  static constexpr int8_t kBroadcastAdvertisingType = 0x2;



  static void Initialize(IBroadcastStateMachineCallbacks*,

                         AdvertisingCallbacks* adv_callbacks);

system/bta/le_audio/broadcaster/state_machine_test.cc

+2 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,8 @@ TEST_F(StateMachineTest, AnnouncementTest) { 
  ASSERT_EQ(p_data[3], ((kBasicAudioAnnouncementServiceUuid >> 8) & 0x00FF));



  // Check advertising parameters

  ASSERT_EQ(adv_params.own_address_type, BLE_ADDR_RANDOM);

  ASSERT_EQ(adv_params.own_address_type,

            BroadcastStateMachine::kBroadcastAdvertisingType);

}



}  // namespace