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

Commit dc241a70 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12217053 from 55f4142b to 24Q4-release 

Change-Id: I8d7ee118f051ca893eda91819c226689be43c1a8
parents 99475486 55f4142b

android/pandora/server/configs/pts_bot_tests_config.json

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ 
    "AVRCP/TG/MCN/CB/BI-03-C",

    "AVRCP/TG/MCN/CB/BI-04-C",

    "AVRCP/TG/MCN/CB/BI-05-C",

    "AVRCP/TG/MCN/CB/BV-01-I",

    "AVRCP/TG/MCN/CB/BV-02-C",

    "AVRCP/TG/MCN/CB/BV-02-I",

    "AVRCP/TG/MCN/CB/BV-03-I",
@@ -164,7 +163,6 @@ 
    "AVRCP/TG/MDI/BV-02-C",

    "AVRCP/TG/MPS/BI-01-C",

    "AVRCP/TG/MPS/BI-02-C",

    "AVRCP/TG/MPS/BV-01-I",

    "AVRCP/TG/MPS/BV-02-C",

    "AVRCP/TG/MPS/BV-02-I",

    "AVRCP/TG/MPS/BV-03-I",
@@ -739,12 +737,14 @@ 
    "AVRCP/CT/CRC/BV-01-I",

    "AVRCP/CT/PTH/BV-01-C",

    "AVRCP/CT/PTT/BV-01-I",

    "AVRCP/TG/MCN/CB/BV-01-I",

    "AVRCP/TG/MCN/CB/BI-02-C",

    "AVRCP/TG/MCN/CB/BV-04-I",

    "AVRCP/TG/MCN/CB/BV-06-C",

    "AVRCP/TG/MCN/CB/BV-09-C",

    "AVRCP/TG/MDI/BV-04-C",

    "AVRCP/TG/MDI/BV-05-C",

    "AVRCP/TG/MPS/BV-01-I",

    "AVRCP/TG/NFY/BV-04-C",

    "BNEP/TX-TYPE-0/BV-20-C",

    "GAP/BIS/BBM/BV-01-C",

flags/bta_dm.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -35,3 +35,13 @@ flag { 
    description: "perform both LE and Classic service discovery simulteanously on capable devices"

    bug: "339217881"

}



flag {

    name: "cancel_open_discovery_client"

    namespace: "bluetooth"

    description: "Cancel connection from discovery client correctly"

    bug: "356168480"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

system/bta/dm/bta_dm_device_search.cc

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static bool bta_dm_read_remote_device_name(const RawAddress& bd_addr, tBT_TRANSP 
    log::verbose("BTM_ReadRemoteDeviceName is started");



    return true;

  } else if (btm_status == BTM_BUSY) {

  } else if (btm_status == tBTM_STATUS::BTM_BUSY) {

    log::verbose("BTM_ReadRemoteDeviceName is busy");



    return true;

system/bta/dm/bta_dm_disc_legacy.cc

+2 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static bool bta_dm_read_remote_device_name(const RawAddress& bd_addr, tBT_TRANSP 
    log::verbose("BTM_ReadRemoteDeviceName is started");



    return true;

  } else if (btm_status == BTM_BUSY) {

  } else if (btm_status == tBTM_STATUS::BTM_BUSY) {

    log::verbose("BTM_ReadRemoteDeviceName is busy");



    /* Remote name discovery is on going now so BTM cannot notify through
@@ -1388,7 +1388,7 @@ static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr, DEV_C 
    /* get name of device */

    btm_status = get_btm_client_interface().peer.BTM_ReadRemoteDeviceName(

            bta_dm_search_cb.peer_bdaddr, bta_dm_remname_cback, BT_TRANSPORT_BR_EDR);

    if (btm_status == BTM_BUSY) {

    if (btm_status == tBTM_STATUS::BTM_BUSY) {

      /* wait for next chance(notification of remote name discovery done) */

      log::verbose("BTM_ReadRemoteDeviceName is busy");

    } else if (btm_status != BTM_CMD_STARTED) {

system/bta/dm/bta_dm_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ void bta_dm_encrypt_cback(RawAddress bd_addr, tBT_TRANSPORT transport, void* /* 
    case BTM_NO_RESOURCES:

      bta_status = BTA_NO_RESOURCES;

      break;

    case BTM_BUSY:

    case tBTM_STATUS::BTM_BUSY:

      bta_status = BTA_BUSY;

      break;

    default: