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

Commit fe3a4e2f authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master 

Bug: 120848293
Change-Id: I1ef532e784869beb11b0487c266063f903523e95
parents fbe0abe1 329ca47e

system/bta/hearing_aid/hearing_aid.cc

+0 −17
Original line number Diff line number Diff line
@@ -246,17 +246,6 @@ class HearingAidImpl : public HearingAid { 
    BTA_GATTC_Open(gatt_if, address, true, GATT_TRANSPORT_LE, false);

  }



  void AddToWhiteList(const RawAddress& address) override {

    VLOG(2) << __func__ << " address: " << address;

    hearingDevices.Add(HearingDevice(address, true));

    BTA_GATTC_Open(gatt_if, address, false, GATT_TRANSPORT_LE, false);

  }



  void RemoveFromWhiteList(const RawAddress& address) override {

    VLOG(2) << __func__ << " address: " << address;

    BTA_GATTC_CancelOpen(gatt_if, address, false);

  }



  void AddFromStorage(const HearingDevice& dev_info, uint16_t is_white_listed) {

    DVLOG(2) << __func__ << " " << dev_info.address

             << ", hiSyncId=" << loghex(dev_info.hi_sync_id)
@@ -1263,10 +1252,6 @@ class HearingAidImpl : public HearingAid { 
    LOG(INFO) << "GAP_EVT_CONN_CLOSED: " << hearingDevice->address

              << ", playback_started=" << hearingDevice->playback_started;



    LOG(INFO) << "GAP_EVT_CONN_CLOSED: " << hearingDevice->address

              << ", playback_started=" << hearingDevice->playback_started;

    hearingDevice->playback_started = false;



    if (hearingDevice->connecting_actively) {

      // cancel pending direct connect

      BTA_GATTC_CancelOpen(gatt_if, address, true);
@@ -1282,8 +1267,6 @@ class HearingAidImpl : public HearingAid { 


    DoDisconnectCleanUp(hearingDevice);



    DoDisconnectCleanUp(hearingDevice);



    hearingDevices.Remove(address);



    if (connected)

system/bta/include/bta_hearing_aid_api.h

+0 −2
Original line number Diff line number Diff line
@@ -176,8 +176,6 @@ class HearingAid { 


  virtual void Connect(const RawAddress& address) = 0;

  virtual void Disconnect(const RawAddress& address) = 0;

  virtual void AddToWhiteList(const RawAddress& address) = 0;

  virtual void RemoveFromWhiteList(const RawAddress& address) = 0;

  virtual void SetVolume(int8_t volume) = 0;

};

system/btif/include/btif_storage.h

+0 −3
Original line number Diff line number Diff line
@@ -227,9 +227,6 @@ void btif_storage_load_bonded_hearing_aids(); 
/** Deletes the bonded hearing aid device info from NVRAM */

void btif_storage_remove_hearing_aid(const RawAddress& address);



/** Add the hearing aid device to white list */

void btif_storage_add_hearing_aid_to_white_list(const RawAddress& address);



/** Remove the hearing aid device from white list */

void btif_storage_remove_hearing_aid_white_list(const RawAddress& address);

system/btif/src/btif_hearing_aid.cc

+0 −16
Original line number Diff line number Diff line
@@ -96,22 +96,6 @@ class HearingAidInterfaceImpl 
        FROM_HERE, Bind(&btif_storage_remove_hearing_aid_white_list, address));

  }



  void AddToWhiteList(const RawAddress& address) override {

    DVLOG(2) << __func__ << " address: " << address;

    do_in_main_thread(FROM_HERE, Bind(&HearingAid::AddToWhiteList,

                                     Unretained(HearingAid::Get()), address));

    do_in_jni_thread(

        FROM_HERE, Bind(&btif_storage_add_hearing_aid_to_white_list, address));

  }



  void RemoveFromWhiteList(const RawAddress& address) override {

    DVLOG(2) << __func__ << " address: " << address;

    do_in_main_thread(FROM_HERE, Bind(&HearingAid::RemoveFromWhiteList,

                                     Unretained(HearingAid::Get()), address));

    do_in_jni_thread(

        FROM_HERE, Bind(&btif_storage_remove_hearing_aid_white_list, address));

  }



  void SetVolume(int8_t volume) override {

    DVLOG(2) << __func__ << " volume: " << +volume;

    do_in_main_thread(FROM_HERE, Bind(&HearingAid::SetVolume,

system/btif/src/btif_storage.cc

+0 −7
Original line number Diff line number Diff line
@@ -1560,13 +1560,6 @@ void btif_storage_remove_hearing_aid(const RawAddress& address) { 
  btif_config_save();

}



/** Add the hearing aid device to white list */

void btif_storage_add_hearing_aid_to_white_list(const RawAddress& address) {

  std::string addrstr = address.ToString();



  btif_config_set_int(addrstr, HEARING_AID_IS_WHITE_LISTED, true);

}



/** Remove the hearing aid device from white list */

void btif_storage_remove_hearing_aid_white_list(const RawAddress& address) {

  std::string addrstr = address.ToString();