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

Commit e196a866 authored by Chienyuan Huang's avatar Chienyuan Huang
Browse files

RAS: Use formal UUIDs 

Flag: com.android.bluetooth.flags.channel_sounding_in_stack
Bug: 324185011
Bug: 379977615
Test: m com.android.btservice
Change-Id: I33896e6045939b4c04bf9b492e2b0765541293fd
parent 37de3cb8

system/bta/ras/ras_types.h

+7 −7
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ static const uint16_t kRingingCounterSize = 0x02; 
static const uint16_t kCccValueSize = 0x02;



namespace uuid {

static const uint16_t kRangingService16Bit = 0x7F7D;

static const uint16_t kRasFeaturesCharacteristic16bit = 0x7F7C;

static const uint16_t kRasRealTimeRangingDataCharacteristic16bit = 0x7F7B;

static const uint16_t kRasOnDemandDataCharacteristic16bit = 0x7F7A;

static const uint16_t kRasControlPointCharacteristic16bit = 0x7F79;

static const uint16_t kRasRangingDataReadyCharacteristic16bit = 0x7F78;

static const uint16_t kRasRangingDataOverWrittenCharacteristic16bit = 0x7F77;

static const uint16_t kRangingService16Bit = 0x185B;

static const uint16_t kRasFeaturesCharacteristic16bit = 0x2C14;

static const uint16_t kRasRealTimeRangingDataCharacteristic16bit = 0x2C15;

static const uint16_t kRasOnDemandDataCharacteristic16bit = 0x2C16;

static const uint16_t kRasControlPointCharacteristic16bit = 0x2C17;

static const uint16_t kRasRangingDataReadyCharacteristic16bit = 0x2C18;

static const uint16_t kRasRangingDataOverWrittenCharacteristic16bit = 0x2C19;

static const uint16_t kClientCharacteristicConfiguration16bit = 0x2902;



static const bluetooth::Uuid kRangingService = bluetooth::Uuid::From16Bit(kRangingService16Bit);

system/stack/include/bt_uuid16.h

+1 −1
Original line number Diff line number Diff line
@@ -126,4 +126,4 @@ 
  0x184c                                  /* Generic Telephony Bearer \

                                             Service*/

#define UUID_SERVCLASS_TMAS_SERVER 0x1855 /* Telephone and Media Audio Service */

#define UUID_SERVCLASS_RAS 0x7F7D         /* Ranging Service */
 
#define UUID_SERVCLASS_RAS 0x185B         /* Ranging Service */