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

Commit 378d9138 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android 10 into master 

Bug: 139893257
Change-Id: I2167af704406e5ac96ee4c388c91c2ff2214f6cc
parents f50a72c8 5a493eb3

PREUPLOAD.cfg

+3 −0
Original line number Diff line number Diff line
@@ -4,3 +4,6 @@ ignore_merged_commits = true 
[Builtin Hooks]

clang_format = true



[Hook Scripts]

aosp_first = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} ".*$"

system/binder/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ cc_library_shared { 
        "-Wextra",

        "-Wno-unused-parameter",

    ],

    sanitize: {

        scs: true,

    },

}



// AIDL interface between libbluetooth-binder and framework.jar

system/bta/ag/bta_ag_cmd.cc

+2 −0
Original line number Diff line number Diff line
@@ -782,9 +782,11 @@ static void bta_ag_bind_response(tBTA_AG_SCB* p_scb, uint8_t arg_type) { 
 ******************************************************************************/

static bool bta_ag_parse_biev_response(tBTA_AG_SCB* p_scb, tBTA_AG_VAL* val) {

  char* p_token = strtok(val->str, ",");

  if (p_token == nullptr) return false;

  uint16_t rcv_ind_id = atoi(p_token);



  p_token = strtok(nullptr, ",");

  if (p_token == nullptr) return false;

  uint16_t rcv_ind_val = atoi(p_token);



  APPL_TRACE_DEBUG("%s BIEV indicator id %d, value %d", __func__, rcv_ind_id,

system/bta/av/bta_av_aact.cc

+1 −1
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ void bta_av_free_sdb(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) { 
 *

 ******************************************************************************/

void bta_av_config_ind(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {

  tBTA_AV_CI_SETCONFIG setconfig;

  tBTA_AV_CI_SETCONFIG setconfig{};

  tAVDT_SEP_INFO* p_info;

  const AvdtpSepConfig* p_evt_cfg = &p_data->str_msg.cfg;

  uint8_t psc_mask = (p_evt_cfg->psc_mask | p_scb->cfg.psc_mask);

system/bta/gatt/bta_gattc_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ void BTA_GATTC_DiscoverServiceByUuid(uint16_t conn_id, const Uuid& srvc_uuid) { 
 * Returns          returns list of gatt::Service or NULL.

 *

 ******************************************************************************/

const std::vector<gatt::Service>* BTA_GATTC_GetServices(uint16_t conn_id) {

const std::list<gatt::Service>* BTA_GATTC_GetServices(uint16_t conn_id) {

  return bta_gattc_get_services(conn_id);

}