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

Commit 7da4dbdc authored by Chienyuan Huang's avatar Chienyuan Huang Committed by Automerger Merge Worker
Browse files

Merge "RAS: implement RAS Features characteristic" into main am: e4bfe847 am: f394fc0b 

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



Change-Id: Ia9bad211c5ed46929de751d3f47180d8551b4b84
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ad595299 f394fc0b

system/bta/ras/ras_server.cc

+37 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ namespace { 
class RasServerImpl;

RasServerImpl* instance;



static constexpr uint32_t kSupportedFeatures = 0;



class RasServerImpl : public bluetooth::ras::RasServer {

 public:

  struct RasCharacteristic {
@@ -58,6 +60,9 @@ class RasServerImpl : public bluetooth::ras::RasServer { 
      case BTA_GATTS_REG_EVT: {

        OnGattServerRegister(p_data);

      } break;

      case BTA_GATTS_READ_CHARACTERISTIC_EVT: {

        OnReadCharacteristic(p_data);

      } break;

      default:

        log::warn("Unhandled event {}", event);

    }
@@ -157,6 +162,38 @@ class RasServerImpl : public bluetooth::ras::RasServer { 
        }));

  }



  void OnReadCharacteristic(tBTA_GATTS* p_data) {

    uint16_t read_req_handle = p_data->req_data.p_data->read_req.handle;

    log::info("read_req_handle: 0x{:04x}, ", read_req_handle);



    tGATTS_RSP p_msg;

    p_msg.attr_value.handle = read_req_handle;

    if (characteristics_.find(read_req_handle) == characteristics_.end()) {

      log::error("Invalid handle 0x{:04x}", read_req_handle);

      BTA_GATTS_SendRsp(p_data->req_data.conn_id, p_data->req_data.trans_id,

                        GATT_INVALID_HANDLE, &p_msg);

      return;

    }



    auto uuid = characteristics_[read_req_handle].uuid_;

    log::info("Read uuid, {}", getUuidName(uuid));



    // Check Characteristic UUID

    switch (uuid.As16Bit()) {

      case kRasFeaturesCharacteristic16bit: {

        p_msg.attr_value.len = kFeatureSize;

        memcpy(p_msg.attr_value.value, &kSupportedFeatures, sizeof(uint32_t));

      } break;

      default:

        log::warn("Unhandled uuid {}", uuid.ToString());

        BTA_GATTS_SendRsp(p_data->req_data.conn_id, p_data->req_data.trans_id,

                          GATT_ILLEGAL_PARAMETER, &p_msg);

        return;

    }

    BTA_GATTS_SendRsp(p_data->req_data.conn_id, p_data->req_data.trans_id,

                      GATT_SUCCESS, &p_msg);

  }



  void OnServiceAdded(tGATT_STATUS status, int server_if,

                      std::vector<btgatt_db_element_t> service) {

    log::info("status: {}, server_if: {}", gatt_status_text(status), server_if);

system/bta/ras/ras_types.h

+8 −0
Original line number Diff line number Diff line
@@ -55,4 +55,12 @@ std::string getUuidName(const bluetooth::Uuid& uuid); 


}  // namespace uuid



namespace feature {

static const uint32_t kRealTimeRangingData = 0x01;

static const uint32_t kRetrieveLostRangingDataSegments = 0x02;

static const uint32_t kAbortOperation = 0x04;

static const uint32_t kFilterRangingData = 0x08;

static const uint32_t kPctPhaseFormat = 0xA0;

}  // namespace feature



}  // namespace ras