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

Commit 0b2b5afe authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I738f2a13,Id0f99289,Iefd5b0c7,I61013efd,I6f8b8ae8, ... am:... 

Merge changes I738f2a13,Id0f99289,Iefd5b0c7,I61013efd,I6f8b8ae8, ... am: 62867200 am: 93824a7a am: 99af1f71

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1509220

Change-Id: Ie42b9115d511c9621019313cc90df2f363c58a59
parents da72299d 99af1f71

system/bta/sys/bta_sys.h

+10 −2
Original line number Diff line number Diff line
@@ -90,10 +90,18 @@ typedef uint8_t tBTA_SYS_ID; 


inline std::string BtaIdSysText(tBTA_SYS_ID sys_id) {

  switch (sys_id) {

    case BTA_ID_DM_SEARCH:

      return std::string("Scanner");

    case BTA_ID_PAN:

      return std::string("PAN Personal area network");

    case BTA_ID_AV:

      return std::string("Advanced audio/video");

    case BTA_ID_HD:

      return std::string("Hid Device");

      return std::string("HID Human interface device");

    case BTA_ID_GATTC:

      return std::string("Gatt client");

      return std::string("GATT client");

    case BTA_ID_GATTS:

      return std::string("GATT server");

    default:

      return std::string("Unknown");

  }

system/btif/src/btif_gatt_client.cc

+4 −10
Original line number Diff line number Diff line
@@ -134,9 +134,6 @@ static void btif_gattc_upstreams_evt(uint16_t event, char* p_param) { 


  tBTA_GATTC* p_data = (tBTA_GATTC*)p_param;

  switch (event) {

    case BTA_GATTC_DEREG_EVT:

      break;



    case BTA_GATTC_EXEC_EVT: {

      HAL_CBACK(bt_gatt_callbacks, client->execute_write_cb,

                p_data->exec_cmpl.conn_id, p_data->exec_cmpl.status);
@@ -193,14 +190,11 @@ static void btif_gattc_upstreams_evt(uint16_t event, char* p_param) { 
    }



    case BTA_GATTC_ACL_EVT:

      LOG_INFO("BTA_GATTC_ACL_EVT: status = %d", p_data->status);

      /* Ignore for now */

      break;



    case BTA_GATTC_DEREG_EVT:

    case BTA_GATTC_SEARCH_RES_EVT:

      break;



    case BTA_GATTC_CANCEL_OPEN_EVT:

    case BTA_GATTC_SRVC_DISC_DONE_EVT:

      LOG_DEBUG("Ignoring event (%d)", event);

      break;



    case BTA_GATTC_CFG_MTU_EVT: {
@@ -234,7 +228,7 @@ static void btif_gattc_upstreams_evt(uint16_t event, char* p_param) { 
      break;



    default:

      LOG_ERROR("%s: Unhandled event (%d)!", __func__, event);

      LOG_ERROR("Unhandled event (%d)!", event);

      break;

  }

}

system/gd/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -480,6 +480,7 @@ genrule { 
    srcs: [

        "common/init_flags.fbs",

        "dumpsys_data.fbs",

        "hci/hci_acl_manager.fbs",

        "l2cap/classic/l2cap_classic_module.fbs",

        "shim/dumpsys.fbs",

    ],
@@ -487,6 +488,7 @@ genrule { 
        "init_flags.bfbs",

        "dumpsys.bfbs",

        "dumpsys_data.bfbs",

        "hci_acl_manager.bfbs",

        "l2cap_classic_module.bfbs",

    ],

}
@@ -500,12 +502,14 @@ genrule { 
    srcs: [

        "common/init_flags.fbs",

        "dumpsys_data.fbs",

        "hci/hci_acl_manager.fbs",

        "l2cap/classic/l2cap_classic_module.fbs",

        "shim/dumpsys.fbs",

    ],

    out: [

        "dumpsys_data_generated.h",

        "dumpsys_generated.h",

        "hci_acl_manager_generated.h",

        "init_flags_generated.h",

        "l2cap_classic_module_generated.h",

    ],

system/gd/common/circular_buffer.h

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
#include <mutex>

#include <queue>



#include "os/log.h"



namespace bluetooth {

namespace common {

system/gd/dumpsys_data.fbs

+2 −0
Original line number Diff line number Diff line 
// Top level module dumpsys data schema

include "common/init_flags.fbs";

include "l2cap/classic/l2cap_classic_module.fbs";

include "hci/hci_acl_manager.fbs";

include "module_unittest.fbs";

include "shim/dumpsys.fbs";
@@ -13,6 +14,7 @@ table DumpsysData { 
    init_flags:common.InitFlagsData (privacy:"Any");

    shim_dumpsys_data:bluetooth.shim.DumpsysModuleData (privacy:"Any");

    l2cap_classic_dumpsys_data:bluetooth.l2cap.classic.L2capClassicModuleData (privacy:"Any");

    hci_acl_manager_dumpsys_data:bluetooth.hci.AclManagerData (privacy:"Any");

    module_unittest_data:bluetooth.ModuleUnitTestData; // private

}