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

Commit 02669912 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "Properties, add a reserved field" into main

parents 5a1dea7d 6808bf00

system/gd/discovery/device/bt_property.cc

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ std::string bt_property_type_text(const bt_property_type_t& type) { 
    CASE_RETURN_TEXT(BT_PROPERTY_REMOTE_IS_COORDINATED_SET_MEMBER);

    CASE_RETURN_TEXT(BT_PROPERTY_APPEARANCE);

    CASE_RETURN_TEXT(BT_PROPERTY_VENDOR_PRODUCT_INFO);

    CASE_RETURN_TEXT(BT_PROPERTY_RESERVED_0x14);

    CASE_RETURN_TEXT(BT_PROPERTY_REMOTE_ASHA_CAPABILITY);

    CASE_RETURN_TEXT(BT_PROPERTY_REMOTE_ASHA_TRUNCATED_HISYNCID);

    CASE_RETURN_TEXT(BT_PROPERTY_REMOTE_MODEL_NUM);
@@ -212,6 +213,9 @@ std::string bt_property_text(const bt_property_t& property) { 
          ((bt_vendor_product_info_t*)property.val)->product_id,

          ((bt_vendor_product_info_t*)property.val)->version);



    case BT_PROPERTY_RESERVED_0x14:

      return base::StringPrintf("type:%s", bt_property_type_text(property.type).c_str());



    case BT_PROPERTY_REMOTE_ASHA_CAPABILITY:

      return base::StringPrintf(

          "type:%s remote_asha_capability:%hd",

system/include/hardware/bluetooth.h

+2 −0
Original line number Diff line number Diff line
@@ -374,6 +374,8 @@ typedef enum { 
   */

  BT_PROPERTY_VENDOR_PRODUCT_INFO,



  BT_PROPERTY_RESERVED_0x14,



  /**

   * Description - ASHA capability.

   * Access mode - GET.