commit 183eacee0d0b744ca90cfcdec40caeebea9c7706
author Yi Kong <yikong@google.com> Fri Mar 29 15:42:58 2019 -0700
committer Yi Kong <yikong@google.com> Fri Apr 05 20:14:57 2019 +0000
tree 136e834ca8f54e6a586abdd52c3264f957a7baad
parent 7702782f80cf0d3f385d217cb8001f5263387879

Modernise code to use override specifier

Generated by clang-tidy.

Test: m checkbuild
Change-Id: Icba58009f6db2a0e9e1360326b0b66fc10d04a5a

audio_hal_interface/client_interface.cc

diff --git a/audio_hal_interface/client_interface.cc b/audio_hal_interface/client_interface.cc
index e6d6a6b..bf3d068 100644
--- a/audio_hal_interface/client_interface.cc
+++ b/audio_hal_interface/client_interface.cc
@@ -73,7 +73,7 @@
                          const android::sp<IBluetoothAudioProvider>& provider)
       : sink_(sink), provider_(provider){};
 
-  Return<void> startStream() {
+  Return<void> startStream() override {
     BluetoothAudioCtrlAck ack = sink_->StartRequest();
     if (ack != BluetoothAudioCtrlAck::PENDING) {
       auto hidl_retval =
@@ -85,7 +85,7 @@
     return Void();
   }
 
-  Return<void> suspendStream() {
+  Return<void> suspendStream() override {
     BluetoothAudioCtrlAck ack = sink_->SuspendRequest();
     if (ack != BluetoothAudioCtrlAck::PENDING) {
       auto hidl_retval =
@@ -97,12 +97,13 @@
     return Void();
   }
 
-  Return<void> stopStream() {
+  Return<void> stopStream() override {
     sink_->StopRequest();
     return Void();
   }
 
-  Return<void> getPresentationPosition(getPresentationPosition_cb _hidl_cb) {
+  Return<void> getPresentationPosition(
+      getPresentationPosition_cb _hidl_cb) override {
     uint64_t remote_delay_report_ns;
     uint64_t total_bytes_read;
     timespec data_position;
@@ -128,7 +129,7 @@
     return Void();
   }
 
-  Return<void> updateMetadata(const SourceMetadata& sourceMetadata) {
+  Return<void> updateMetadata(const SourceMetadata& sourceMetadata) override {
     LOG(INFO) << __func__ << ": " << sourceMetadata.tracks.size()
               << " track(s)";
     // refer to StreamOut.impl.h within Audio HAL (AUDIO_HAL_VERSION_5_0)
@@ -166,7 +167,8 @@
       : bluetooth_audio_clientif_(clientif), message_loop_(message_loop) {}
   void serviceDied(
       uint64_t /*cookie*/,
-      const ::android::wp<::android::hidl::base::V1_0::IBase>& /*who*/) {
+      const ::android::wp<::android::hidl::base::V1_0::IBase>& /*who*/)
+      override {
     LOG(WARNING) << __func__ << ": restarting connection with new Audio Hal";
     if (bluetooth_audio_clientif_ != nullptr && message_loop_ != nullptr) {
       // restart the session on the correct thread

audio_hal_interface/client_interface_unittest.cc

diff --git a/audio_hal_interface/client_interface_unittest.cc b/audio_hal_interface/client_interface_unittest.cc
index de6ba52..fd8c8dc 100644
--- a/audio_hal_interface/client_interface_unittest.cc
+++ b/audio_hal_interface/client_interface_unittest.cc
@@ -65,16 +65,16 @@
  public:
   TestTransport(SessionType session_type)
       : bluetooth::audio::IBluetoothTransportInstance(session_type, {}){};
-  bluetooth::audio::BluetoothAudioCtrlAck StartRequest() {
+  bluetooth::audio::BluetoothAudioCtrlAck StartRequest() override {
     return bluetooth::audio::BluetoothAudioCtrlAck::SUCCESS_FINISHED;
   }
-  bluetooth::audio::BluetoothAudioCtrlAck SuspendRequest() {
+  bluetooth::audio::BluetoothAudioCtrlAck SuspendRequest() override {
     return bluetooth::audio::BluetoothAudioCtrlAck::SUCCESS_FINISHED;
   }
-  void StopRequest() {}
+  void StopRequest() override {}
   bool GetPresentationPosition(uint64_t* remote_delay_report_ns,
                                uint64_t* total_bytes_readed,
-                               timespec* data_position) {
+                               timespec* data_position) override {
     if (remote_delay_report_ns) {
       *remote_delay_report_ns = kRemoteDelayReportMs * 1000000;
     }
@@ -86,9 +86,10 @@
     }
     return true;
   }
-  void MetadataChanged(const source_metadata_t& source_metadata __unused) {}
-  void ResetPresentationPosition(){};
-  void LogBytesRead(size_t bytes_readed __unused){};
+  void MetadataChanged(
+      const source_metadata_t& source_metadata __unused) override {}
+  void ResetPresentationPosition() override{};
+  void LogBytesRead(size_t bytes_readed __unused) override{};
 };
 
 class BluetoothAudioClientInterfaceTest : public Test {
@@ -98,9 +99,9 @@
 
   static constexpr int kClientIfReturnSuccess = 0;
 
-  virtual void SetUp() override {}
+  void SetUp() override {}
 
-  virtual void TearDown() override {
+  void TearDown() override {
     clientif_ = nullptr;
     test_transport_ = nullptr;
   }