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

Commit 8c332fc6 authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

Merge "Remove unreachable code" am: ac19d422 

am: a7c87a41

Change-Id: I7945786cccb01bcbaff473c76a210d2540c386ed
parents 30bb89af a7c87a41

system/bta/gatt/bta_gattc_cache.cc

+0 −5
Original line number Diff line number Diff line
@@ -1060,11 +1060,6 @@ bool bta_gattc_cache_load(tBTA_GATTC_CLCB* p_clcb) { 
    goto done;

  }



  if (num_attr > 0xFFFF) {

    LOG(ERROR) << __func__ << ": more than 0xFFFF GATT attributes: " << fname;

    goto done;

  }



  attr = (tBTA_GATTC_NV_ATTR*)osi_malloc(sizeof(tBTA_GATTC_NV_ATTR) * num_attr);



  if (fread(attr, sizeof(tBTA_GATTC_NV_ATTR), num_attr, fd) != num_attr) {

system/stack/btm/btm_ble_batchscan.cc

+2 −2
Original line number Diff line number Diff line
@@ -496,8 +496,8 @@ void BTM_BleReadScanReports(tBTM_BLE_BATCH_SCAN_MODE scan_mode, 


  /* Check only for modes, as scan reports can be called after disabling batch

   * scan */

  if (read_scan_mode < 0 || (scan_mode != BTM_BLE_BATCH_SCAN_MODE_PASS &&

                             scan_mode != BTM_BLE_BATCH_SCAN_MODE_ACTI)) {

  if (scan_mode != BTM_BLE_BATCH_SCAN_MODE_PASS &&

      scan_mode != BTM_BLE_BATCH_SCAN_MODE_ACTI) {

    BTM_TRACE_ERROR("Illegal read scan params: %d, %d, %d", read_scan_mode,

                    scan_mode, ble_batchscan_cb.cur_state);

    cb.Run(BTM_ILLEGAL_VALUE, 0, 0, {});