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

Commit 4dcfef8c authored by Jayden Kim's avatar Jayden Kim Committed by Gerrit Code Review
Browse files

Merge "Flags 24Q3: Remove the flag bt_system_context_report" into main

parents b1266aa1 56a5a52c

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+1 −8
Original line number Diff line number Diff line
@@ -6429,14 +6429,7 @@ public class AdapterService extends Service { 
            long idleTime,

            long energyUsed,

            UidTraffic[] data) {

        if (Flags.btSystemContextReport()) {

            energyInfoCallbackInternal(

                    status, ctrlState, txTime, rxTime, idleTime, energyUsed, data);

        } else if (ctrlState >= BluetoothActivityEnergyInfo.BT_STACK_STATE_INVALID

                && ctrlState <= BluetoothActivityEnergyInfo.BT_STACK_STATE_STATE_IDLE) {

            energyInfoCallbackInternal(

                    status, ctrlState, txTime, rxTime, idleTime, energyUsed, data);

        }

        energyInfoCallbackInternal(status, ctrlState, txTime, rxTime, idleTime, energyUsed, data);

        Log.v(

                TAG,

                "energyInfoCallback()"

flags/bta_dm.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ flag { 
    bug: "321170442"

}



flag {

    name: "bt_system_context_report"

    namespace: "bluetooth"

    description: "Report Bluetooth system context through bta_ble_energy_info_cmpl"

    bug: "323083457"

}



flag {

    name: "bta_dm_discover_both"

    namespace: "bluetooth"

system/bta/dm/bta_dm_act.cc

+1 −3
Original line number Diff line number Diff line
@@ -1671,9 +1671,7 @@ static void bta_ble_energy_info_cmpl(tBTM_BLE_TX_TIME_MS tx_time, tBTM_BLE_RX_TI 
  tBTM_CONTRL_STATE ctrl_state = BTM_CONTRL_UNKNOWN;



  if (BTA_SUCCESS == st) {

    ctrl_state = com::android::bluetooth::flags::bt_system_context_report()

                         ? bta_dm_obtain_system_context()

                         : bta_dm_pm_obtain_controller_state();

    ctrl_state = bta_dm_obtain_system_context();

  }



  if (bta_dm_cb.p_energy_info_cback) {