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

Commit 0728182b authored by Weichin Weng's avatar Weichin Weng Committed by Automerger Merge Worker
Browse files

Merge "HearingAid: Config GAP_HANDLE initialize value is GAP_INVALID_HANDLE."... 

Merge "HearingAid: Config GAP_HANDLE initialize value is GAP_INVALID_HANDLE." am: 9d718b1d am: 74603bc1 am: e584a12b

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

Change-Id: Iedf1847d4b35d19e345a40d6ed364666605ec1a3
parents ceb1bc41 e584a12b

system/bta/hearing_aid/hearing_aid.cc

+4 −5
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include "stack/include/acl_api_types.h"  // tBTM_RSSI_RESULT

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_octets.h"

#include "stack/include/gap_api.h"

#include "stack/include/l2c_api.h"  // L2CAP_MIN_OFFSET

#include "types/bluetooth/uuid.h"

#include "types/bt_transport.h"
@@ -589,9 +588,9 @@ class HearingAidImpl : public HearingAid { 
    hearingDevice->first_connection = true;

    hearingDevice->service_changed_rcvd = true;

    BtaGattQueue::Clean(hearingDevice->conn_id);

    if (hearingDevice->gap_handle) {

    if (hearingDevice->gap_handle != GAP_INVALID_HANDLE) {

      GAP_ConnClose(hearingDevice->gap_handle);

      hearingDevice->gap_handle = 0;

      hearingDevice->gap_handle = GAP_INVALID_HANDLE;

    }

  }
@@ -1549,9 +1548,9 @@ class HearingAidImpl : public HearingAid { 
      hearingDevice->conn_id = 0;

    }



    if (hearingDevice->gap_handle) {

    if (hearingDevice->gap_handle != GAP_INVALID_HANDLE) {

      GAP_ConnClose(hearingDevice->gap_handle);

      hearingDevice->gap_handle = 0;

      hearingDevice->gap_handle = GAP_INVALID_HANDLE;

    }



    hearingDevice->accepting_audio = false;

system/bta/include/bta_hearing_aid_api.h

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <functional>

#include <vector>



#include "stack/include/gap_api.h"

#include "types/raw_address.h"



constexpr uint16_t HEARINGAID_MAX_NUM_UUIDS = 1;
@@ -166,7 +167,7 @@ struct HearingDevice { 
        connection_update_status(NONE),

        accepting_audio(false),

        conn_id(0),

        gap_handle(0),

        gap_handle(GAP_INVALID_HANDLE),

        audio_control_point_handle(audio_control_point_handle),

        audio_status_handle(audio_status_handle),

        audio_status_ccc_handle(audio_status_ccc_handle),
@@ -190,7 +191,7 @@ struct HearingDevice { 
        connection_update_status(NONE),

        accepting_audio(false),

        conn_id(0),

        gap_handle(0),

        gap_handle(GAP_INVALID_HANDLE),

        audio_status_handle(0),

        audio_status_ccc_handle(0),

        service_changed_ccc_handle(0),