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

Commit 70ab22e5 authored by Omair Kamil's avatar Omair Kamil Committed by Automerger Merge Worker
Browse files

Clean up flag update_inquiry_result_on_flag_change. am: fe3bb33e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3188100



Change-Id: If3a6719e7ffb7ccb8ffb46491012695553a0943a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2af2495 fe3bb33e

flags/gap.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -123,16 +123,6 @@ flag { 
    }

}



flag {

    name: "update_inquiry_result_on_flag_change"

    namespace: "bluetooth"

    description: "Update ADV flag in inquiry result as soon as updated flag received"

    bug: "329872838"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "ble_gatt_server_use_address_type_in_connection"

    namespace: "bluetooth"

system/stack/btm/btm_ble_gap.cc

+1 −2
Original line number Diff line number Diff line
@@ -2302,8 +2302,7 @@ void btm_ble_process_adv_pkt_cont_for_inquiry(uint16_t evt_type, tBLE_ADDR_TYPE 
    if (p_i && (!(p_i->inq_info.results.device_type & BT_DEVICE_TYPE_BLE) ||

                /* scan response to be updated */

                (!p_i->scan_rsp) || (!p_i->inq_info.results.include_rsi && include_rsi) ||

                (com::android::bluetooth::flags::update_inquiry_result_on_flag_change() &&

                 !p_i->inq_info.results.flag && p_flag && *p_flag))) {

                (!p_i->inq_info.results.flag && p_flag && *p_flag))) {

      update = true;

    } else if (btm_cb.ble_ctr_cb.is_ble_observe_active()) {

      btm_cb.neighbor.le_observe.results++;