| commit | 5ad2b7fda60214af21d6186ce9990c1e02566775 | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Tue Nov 16 02:41:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 16 02:41:12 2021 +0000 |
| tree | a0e806faca9ce764399f7a5240382398c1b90cc4 | |
| parent | 3e31733ee7cf54dbe9ec968e72466f79ce146b27 [diff] | |
| parent | 4915df85a0d5a726a49b4c262403502272a34c2e [diff] |
Merge "health: do not use default destructor." am: 4915df85a0 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1891477 Change-Id: Ic285591bb95390f867a3b2b9379704e625e73101
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;