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

Commit f631f6eb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Enable RAS only for channel sounding." into main am: a8af5057 am: d289a644 

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



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

system/main/shim/distance_measurement_manager.cc

+6 −2
Original line number Diff line number Diff line
@@ -60,11 +60,15 @@ public: 
  }



  void StartDistanceMeasurement(RawAddress identity_addr, uint16_t interval, uint8_t method) {

    DistanceMeasurementMethod distance_measurement_method =

            static_cast<DistanceMeasurementMethod>(method);

    bluetooth::shim::GetDistanceMeasurementManager()->StartDistanceMeasurement(

            bluetooth::ToGdAddress(identity_addr), GetConnectionHandle(identity_addr), interval,

            static_cast<DistanceMeasurementMethod>(method));

            distance_measurement_method);

    if (distance_measurement_method == DistanceMeasurementMethod::METHOD_CS) {

      bluetooth::ras::GetRasClient()->Connect(identity_addr);

    }

  }



  void StopDistanceMeasurement(RawAddress identity_addr, uint8_t method) {

    bluetooth::shim::GetDistanceMeasurementManager()->StopDistanceMeasurement(