commit | d3a63f0512ea55652b72ca999bedb0eb24902e2b | [log] [tgz] |
---|---|---|
author | Yifan Hong <elsk@google.com> | Tue Nov 16 03:20:44 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 16 03:20:44 2021 +0000 |
tree | 384b5f58193db94705b9174bfdf9984a67795873 | |
parent | 5b537a1812dbd2ff751fd424b04c7051b4f0b8f5 [diff] | |
parent | 8e6e7afc9eeee7661a82a51b562e9f679a032dc7 [diff] |
Merge "health: do not use default destructor." am: 4915df85a0 am: 5ad2b7fda6 am: 4651b98b59 am: 8e6e7afc9e Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1891477 Change-Id: I1cf9797876917d418a74d0f77abfb73f8f603d96
diff --git a/health/aidl/default/Health.cpp b/health/aidl/default/Health.cpp index 812e64a..e1d1982 100644 --- a/health/aidl/default/Health.cpp +++ b/health/aidl/default/Health.cpp
@@ -60,6 +60,8 @@ battery_monitor_.init(healthd_config_.get()); } +Health::~Health() {} + // // Getters. //
diff --git a/health/aidl/default/include/health-impl/Health.h b/health/aidl/default/include/health-impl/Health.h index e49f44c..6bd4946 100644 --- a/health/aidl/default/include/health-impl/Health.h +++ b/health/aidl/default/include/health-impl/Health.h
@@ -43,6 +43,7 @@ // A subclass may modify |config| before passing it to the parent constructor. // See implementation of Health for code samples. Health(std::string_view instance_name, std::unique_ptr<struct healthd_config>&& config); + virtual ~Health(); ndk::ScopedAStatus registerCallback( const std::shared_ptr<IHealthInfoCallback>& callback) override;