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

Commit 9f4b5495 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Icf44a863,I8dc5ab4d into main am: 395d43e0 

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



Change-Id: Ib6ea93eef8d9050f5bf3e6ab569f9e7f22cf6a7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7bda470e 395d43e0

system/bta/hearing_aid/hearing_aid.cc

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

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

        /// 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_NONE,

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

    encoder_state_release();

    current_volume = VOLUME_UNKNOWN;

    ResetAsrc();

  }



  void SetVolume(int8_t volume) {