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

Commit 9cccf3f8 authored by Chienyuan Huang's avatar Chienyuan Huang
Browse files

RAS: Refine variable and function naming 

Flag: com.android.bluetooth.flags.channel_sounding_in_stack
Bug: 324185011
Bug: 369303724
Test: m com.android.btservice
Change-Id: Id5afab05485c6d4dff9511d403cff9e8e1257ceb
parent 9ed34ac3

system/bta/ras/ras_client.cc

+11 −11
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ public: 
    bool is_connected_ = false;

    bool service_search_complete_ = false;

    std::vector<VendorSpecificCharacteristic> vendor_specific_characteristics_;

    uint8_t writeReplyCounter_ = 0;

    uint8_t writeReplySuccessCounter_ = 0;

    uint8_t write_reply_counter_ = 0;

    uint8_t write_reply_success_counter_ = 0;



    const gatt::Characteristic* FindCharacteristicByUuid(Uuid uuid) {

      for (auto& characteristic : service_->characteristics) {
@@ -438,9 +438,9 @@ public: 
      if (structPtr->type_ == CallbackDataType::VENDOR_SPECIFIC_REPLY) {

        log::info("Write vendor specific reply complete");

        auto tracker = FindTrackerByHandle(conn_id);

        tracker->writeReplyCounter_++;

        tracker->write_reply_counter_++;

        if (status == GATT_SUCCESS) {

          tracker->writeReplySuccessCounter_++;

          tracker->write_reply_success_counter_++;

        } else {

          log::error(

                  "Fail to write vendor specific reply conn_id {}, status {}, "
@@ -448,16 +448,16 @@ public: 
                  conn_id, gatt_status_text(status), handle);

        }

        // All reply complete

        if (tracker->writeReplyCounter_ == tracker->vendor_specific_characteristics_.size()) {

        if (tracker->write_reply_counter_ == tracker->vendor_specific_characteristics_.size()) {

          log::info(

                  "All vendor specific reply write complete, size {} "

                  "successCounter {}",

                  tracker->vendor_specific_characteristics_.size(),

                  tracker->writeReplySuccessCounter_);

          bool success = tracker->writeReplySuccessCounter_ ==

                  tracker->write_reply_success_counter_);

          bool success = tracker->write_reply_success_counter_ ==

                         tracker->vendor_specific_characteristics_.size();

          tracker->writeReplyCounter_ = 0;

          tracker->writeReplySuccessCounter_ = 0;

          tracker->write_reply_counter_ = 0;

          tracker->write_reply_success_counter_ = 0;

          callbacks_->OnWriteVendorSpecificReplyComplete(tracker->address_for_cs_, success);

        }

        return;
@@ -616,7 +616,7 @@ public: 
        }

        STREAM_TO_UINT32(tracker->remote_supported_features_, value);

        log::info("Remote supported features : {}",

                  getFeaturesString(tracker->remote_supported_features_));

                  GetFeaturesString(tracker->remote_supported_features_));

      } break;

      default:

        log::warn("Unexpected UUID");
@@ -678,7 +678,7 @@ public: 
    }

  }



  std::string getFeaturesString(uint32_t value) {

  std::string GetFeaturesString(uint32_t value) {

    std::stringstream ss;

    ss << value;

    if (value == 0) {