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

Commit c695035d authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Gerrit Code Review
Browse files

Merge changes I177e3a01,I7755a32f,I97e7a716 

* changes:
  leaudio: Limit GroupStatus only to active/inactive
  btm/iso: Improve logging
  btm/iso: Add common hci constants
parents c7ba9f6b e6e873b7

system/binder/android/bluetooth/IBluetoothLeAudio.aidl

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ interface IBluetoothLeAudio { 


    const int LE_AUDIO_GROUP_ID_INVALID = -1;



    const int GROUP_STATUS_INACTIVE = 0;

    const int GROUP_STATUS_ACTIVE = 1;



    /**

     * Get device group id. Devices with same group id belong to same group (i.e left and right

     * earbud)

system/include/hardware/bt_le_audio.h

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ enum class ConnectionState { 
};



enum class GroupStatus {

  INACTIVE = 0,

  ACTIVE,

};



enum class GroupStreamStatus {

  IDLE = 0,

  STREAMING,

  SUSPENDED,

system/stack/btm/btm_iso_impl.h

+2 −1
Original line number Diff line number Diff line
@@ -420,7 +420,8 @@ struct iso_impl { 
    if (iso_credits_ == 0 || data_len > iso_buffer_size_) {

      LOG(WARNING) << __func__ << ", dropping ISO packet, len: "

                   << static_cast<int>(data_len)

                   << ", iso credits: " << static_cast<int>(iso_credits_);

                   << ", iso credits: " << static_cast<int>(iso_credits_)

                   << ", iso handle: " << loghex(iso_handle);

      return;

    }

system/stack/include/btm_iso_api_types.h

+13 −0
Original line number Diff line number Diff line
@@ -25,6 +25,19 @@ 


namespace bluetooth {

namespace hci {

constexpr uint8_t kIsoCodingFormatLc3 = 0x06;

constexpr uint8_t kIsoCodingFormatVendorSpecific = 0xFF;



constexpr uint8_t kIsoCigPackingSequential = 0x00;

constexpr uint8_t kIsoCigPackingInterleaved = 0x01;



constexpr uint8_t kIsoCigFramingUnframed = 0x00;

constexpr uint8_t kIsoCigFramingFramed = 0x01;



constexpr uint8_t kIsoCigPhy1M = 0x01;

constexpr uint8_t kIsoCigPhy2M = 0x02;

constexpr uint8_t kIsoCigPhyC = 0x04;



namespace iso_manager {



constexpr uint8_t kIsoDataPathDirectionIn = 0x00;