OSDN Git Service

Merge changes Iddb20c40,Iddc3cd02
authorTreehugger Robot <treehugger-gerrit@google.com>
Fri, 21 Aug 2020 22:06:38 +0000 (22:06 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 21 Aug 2020 22:06:38 +0000 (22:06 +0000)
* changes:
  GD-HCI: Send original command instead of status packet upwards
  BTM-PM: Get rid of BTM_PM_DEBUG flag

1  2 
stack/acl/btm_acl.cc

@@@ -381,10 -382,12 +382,8 @@@ void btm_acl_created(const RawAddress& 
        tBTM_PM_MCB* p_db = &btm_cb.acl_cb_.pm_mode_db[xx]; /* per ACL link */
        memset(p_db, 0, sizeof(tBTM_PM_MCB));
        p_db->state = BTM_PM_ST_ACTIVE;
- #if (BTM_PM_DEBUG == TRUE)
-       BTM_TRACE_DEBUG("btm_pm_sm_alloc ind:%d st:%d", xx, p_db->state);
- #endif  // BTM_PM_DEBUG
+       LOG_VERBOSE("btm_pm_sm_alloc ind:%d st:%d", xx, p_db->state);
  
 -      if (dc) memcpy(p->remote_dc, dc, DEV_CLASS_LEN);
 -
 -      if (bdn) memcpy(p->remote_name, bdn, BTM_MAX_REM_BD_NAME_LEN);
 -
        /* if BR/EDR do something more */
        if (transport == BT_TRANSPORT_BR_EDR) {
          btsnd_hcic_read_rmt_clk_offset(p->hci_handle);