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

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

Merge changes I32d24c37,Icf7d6b35 into main 

* changes:
  Remove released flag leaudio_enable_health_based_actions
  Remove released flag divide_long_single_gap_data
parents f4a3bdab 5da60cfc

flags/gap.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ flag { 
    bug: "308855997"

}



flag {

    name: "divide_long_single_gap_data"

    namespace: "bluetooth"

    description: "Divide long single gap data if length is longer than HCI data length limit"

    bug: "310217895"

}



flag {

    name: "fix_nonconnectable_scannable_advertisement"

    namespace: "bluetooth"

flags/leaudio.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -17,13 +17,6 @@ flag { 
    bug: "307408418"

}



flag {

    name: "leaudio_enable_health_based_actions"

    namespace: "bluetooth"

    description: "Le audio device and group health actions for fallback mechanism"

    bug: "290845728"

}



flag {

    name: "leaudio_broadcast_audio_handover_policies"

    namespace: "bluetooth"

system/bta/le_audio/client.cc

+4 −6
Original line number Diff line number Diff line
@@ -267,12 +267,10 @@ class LeAudioClientImpl : public LeAudioClient { 
      reconnection_mode_ = BTM_BLE_BKG_CONNECT_ALLOW_LIST;

    }



    if (com::android::bluetooth::flags::leaudio_enable_health_based_actions()) {

    log::info("Loading health status module");

    leAudioHealthStatus_ = LeAudioHealthStatus::Get();

    leAudioHealthStatus_->RegisterCallback(

        base::BindRepeating(le_audio_health_status_callback));

    }



    BTA_GATTC_AppRegister(

        le_audio_gattc_callback,

system/bta/le_audio/le_audio_client_test.cc

+8 −24
Original line number Diff line number Diff line
@@ -3160,10 +3160,7 @@ TEST_F(UnicastTest, ConnectOneEarbudWithInvalidCsis) { 
  Mock::VerifyAndClearExpectations(&mock_audio_hal_client_callbacks_);

}



TEST_F_WITH_FLAGS(UnicastTestHealthStatus,

                  ConnectOneEarbudEmpty_withHealthStatus,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(

                      TEST_BT, leaudio_enable_health_based_actions))) {

TEST_F(UnicastTestHealthStatus, ConnectOneEarbudEmpty_withHealthStatus) {

  const RawAddress test_address0 = GetTestAddress(0);

  SetSampleDatabaseEmpty(1, test_address0);

  EXPECT_CALL(mock_audio_hal_client_callbacks_,
@@ -3183,10 +3180,7 @@ TEST_F_WITH_FLAGS(UnicastTestHealthStatus, 
      test_address0, bluetooth::groups::kGroupUnknown);

}



TEST_F_WITH_FLAGS(UnicastTestHealthStatus,

                  ConnectOneEarbudNoPacs_withHealthStatus,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(

                      TEST_BT, leaudio_enable_health_based_actions))) {

TEST_F(UnicastTestHealthStatus, ConnectOneEarbudNoPacs_withHealthStatus) {

  const RawAddress test_address0 = GetTestAddress(0);

  SetSampleDatabaseEarbudsValid(

      1, test_address0, codec_spec_conf::kLeAudioLocationStereo,
@@ -3213,10 +3207,7 @@ TEST_F_WITH_FLAGS(UnicastTestHealthStatus, 
      test_address0, bluetooth::groups::kGroupUnknown);

}



TEST_F_WITH_FLAGS(UnicastTestHealthStatus,

                  ConnectOneEarbudNoAscs_withHealthStatus,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(

                      TEST_BT, leaudio_enable_health_based_actions))) {

TEST_F(UnicastTestHealthStatus, ConnectOneEarbudNoAscs_withHealthStatus) {

  const RawAddress test_address0 = GetTestAddress(0);

  SetSampleDatabaseEarbudsValid(

      1, test_address0, codec_spec_conf::kLeAudioLocationStereo,
@@ -3295,10 +3286,8 @@ TEST_F(UnicastTestHealthStatus, ConnectOneEarbudNoCsis_withHealthStatus) { 
      test_address0, bluetooth::groups::kGroupUnknown);

}



TEST_F_WITH_FLAGS(UnicastTestHealthStatus,

                  ConnectOneEarbudWithInvalidCsis_withHealthStatus,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(

                      TEST_BT, leaudio_enable_health_based_actions))) {

TEST_F(UnicastTestHealthStatus,

       ConnectOneEarbudWithInvalidCsis_withHealthStatus) {

  const RawAddress test_address0 = GetTestAddress(0);

  SetSampleDatabaseEarbudsValid(

      1, test_address0, codec_spec_conf::kLeAudioLocationStereo,
@@ -3337,10 +3326,7 @@ TEST_F_WITH_FLAGS(UnicastTestHealthStatus, 
      test_address0, bluetooth::groups::kGroupUnknown);

}



TEST_F_WITH_FLAGS(UnicastTestHealthStatus,

                  ConnectOneEarbudDisable_withHealthStatus,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(

                      TEST_BT, leaudio_enable_health_based_actions))) {

TEST_F(UnicastTestHealthStatus, ConnectOneEarbudDisable_withHealthStatus) {

  const RawAddress test_address0 = GetTestAddress(0);

  int conn_id = 1;
@@ -3395,10 +3381,8 @@ TEST_F_WITH_FLAGS(UnicastTestHealthStatus, 
  Mock::VerifyAndClearExpectations(&mock_audio_hal_client_callbacks_);

}



TEST_F_WITH_FLAGS(UnicastTestHealthStatus,

                  ConnectOneEarbudConsiderDisabling_withHealthStatus,

                  REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(

                      TEST_BT, leaudio_enable_health_based_actions))) {

TEST_F(UnicastTestHealthStatus,

       ConnectOneEarbudConsiderDisabling_withHealthStatus) {

  const RawAddress test_address0 = GetTestAddress(0);

  int conn_id = 1;

system/bta/le_audio/state_machine.cc

+0 −5
Original line number Diff line number Diff line
@@ -330,11 +330,6 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { 
  void notifyLeAudioHealth(

      LeAudioDeviceGroup* group,

      bluetooth::le_audio::LeAudioHealthGroupStatType stat) {

    if (!com::android::bluetooth::flags::

            leaudio_enable_health_based_actions()) {

      return;

    }



    auto leAudioHealthStatus = bluetooth::le_audio::LeAudioHealthStatus::Get();

    if (leAudioHealthStatus) {

      leAudioHealthStatus->AddStatisticForGroup(group, stat);