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

Commit 395d43e0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Icf44a863,I8dc5ab4d into main 

* changes:
  hearing_aid: Reset the resampler context when all devices are disconnected
  hearing_aid: Fix incorrect flag used
parents 5dc2c2ce c1c8978a

system/bta/hearing_aid/hearing_aid.cc

+2 −1
Original line number Original line Diff line number Diff line
@@ -1106,7 +1106,7 @@ class HearingAidImpl : public HearingAid { 
        /// The L2CAP will automatically reconnect the LE-ACL link on

        /// The L2CAP will automatically reconnect the LE-ACL link on

        /// disconnection when there is a pending channel request,

        /// disconnection when there is a pending channel request,

        /// which invalidates all encryption checks performed here.

        /// which invalidates all encryption checks performed here.

        com::android::bluetooth::flags::asha_asrc()

        com::android::bluetooth::flags::asha_encrypted_l2c_coc()

            ? BTM_SEC_IN_ENCRYPT | BTM_SEC_OUT_ENCRYPT

            ? BTM_SEC_IN_ENCRYPT | BTM_SEC_OUT_ENCRYPT

            : BTM_SEC_NONE,

            : BTM_SEC_NONE,

        HearingAidImpl::GapCallbackStatic, BT_TRANSPORT_LE);

        HearingAidImpl::GapCallbackStatic, BT_TRANSPORT_LE);
@@ -1953,6 +1953,7 @@ class HearingAidImpl : public HearingAid { 
    audio_running = false;

    audio_running = false;

    encoder_state_release();

    encoder_state_release();

    current_volume = VOLUME_UNKNOWN;

    current_volume = VOLUME_UNKNOWN;

    ResetAsrc();

  }

  }





  void SetVolume(int8_t volume) {

  void SetVolume(int8_t volume) {