| commit | 8e6e7afc9eeee7661a82a51b562e9f679a032dc7 | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Tue Nov 16 03:06:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 16 03:06:45 2021 +0000 |
| tree | 3485cd60448ec9f0aab4b9a6914ea90740bc0112 | |
| parent | 43b5f0f221f5d1c4d3a95c9d8815c5dfccdbebea [diff] | |
| parent | 4651b98b59a50e6fccd7159a0a00e198763de0e4 [diff] |
Merge "health: do not use default destructor." am: 4915df85a0 am: 5ad2b7fda6 am: 4651b98b59 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1891477 Change-Id: Id9838727fb702a45c6d3393f539e7f045a33b999
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;