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

Commit aab19126 authored by Yi Kong's avatar Yi Kong Committed by Gerrit Code Review
Browse files

Merge "Fix a bunch of incorrect syntax statements"

parents 3516c0e5 6bf3043b

system/bta/gatt/bta_gattc_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ void bta_gattc_proc_other_indication(tBTA_GATTC_CLCB* p_clcb, uint8_t op, 
          << StringPrintf(

                 ": check p_data->att_value.handle=%d p_data->handle=%d",

                 p_data->att_value.handle, p_data->handle);

  VLOG(1) << "is_notify", p_notify->is_notify;

  VLOG(1) << "is_notify " << p_notify->is_notify;



  p_notify->is_notify = (op == GATTC_OPTYPE_INDICATION) ? false : true;

  p_notify->len = p_data->att_value.len;

system/bta/jv/bta_jv_act.cc

+2 −4
Original line number Diff line number Diff line
@@ -194,9 +194,7 @@ tBTA_JV_RFC_CB* bta_jv_alloc_rfc_cb(uint16_t port_handle, 
    }

  }

  if (p_cb == NULL) {

    LOG(ERROR) << __func__ << "port_handle=" << port_handle

               << " ctrl block exceeds limit:" << port_handle,

        BTA_JV_MAX_RFC_CONN;

    LOG(ERROR) << __func__ << "port_handle=" << port_handle << " ctrl block exceeds limit:" << BTA_JV_MAX_RFC_CONN;

  }

  return p_cb;

}
@@ -789,7 +787,7 @@ void bta_jv_start_discovery(const RawAddress& bd_addr, uint16_t num_uuid, 
  }



  /* init the database/set up the filter */

  VLOG(2) << __func__ << ": call SDP_InitDiscoveryDb, num_uuid=", num_uuid;

  VLOG(2) << __func__ << ": call SDP_InitDiscoveryDb, num_uuid=" << num_uuid;

  SDP_InitDiscoveryDb(p_bta_jv_cfg->p_sdp_db, p_bta_jv_cfg->sdp_db_size,

                      num_uuid, uuid_list, 0, NULL);