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

Commit 8d55fc1b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Get rid of le_audio_dev_type_detection_fix" into main am: 04f214fe 

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



Change-Id: Ia7a6196c781f76b69520ffb9b8ec624d954ac884
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30e532e4 04f214fe

flags/leaudio.aconfig

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

}



flag {

    name: "le_audio_dev_type_detection_fix"

    namespace: "bluetooth"

    description: "Better LE Audio devices detection"

    bug: "319511584"

}



flag {

    name: "metadata_api_inactive_audio_device_upon_connection"

    is_exported: true

system/btif/src/btif_dm.cc

+1 −2
Original line number Diff line number Diff line
@@ -762,8 +762,7 @@ bool is_device_le_audio_capable(const RawAddress bd_addr) { 
  /* First try reading device type from BTIF - it persists over multiple

   * inquiry sessions */

  int dev_type = 0;

  if (com::android::bluetooth::flags::le_audio_dev_type_detection_fix() &&

      (btif_get_device_type(bd_addr, &dev_type) &&

  if ((btif_get_device_type(bd_addr, &dev_type) &&

       (dev_type & BT_DEVICE_TYPE_BLE) == BT_DEVICE_TYPE_BLE)) {

    /* LE Audio capable device is discoverable over both LE and Classic using

     * same address. Prefer to use LE transport, as we don't know if it can do