From 2d418a2b5be1749933ede43afb83376fd04ca334 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Fri, 12 Nov 2021 18:13:51 -0800
Subject: [PATCH] health: do not use default destructor.

Otherwise, clients will need to know how to destroy
LinkedCallback, a hidden class.

Test: builds
Bug: 177269435
Change-Id: I89532755da16b672c4cbece55b943306f68cdb9e
---
 health/aidl/default/Health.cpp                   | 2 ++
 health/aidl/default/include/health-impl/Health.h | 1 +
 2 files changed, 3 insertions(+)

diff --git a/health/aidl/default/Health.cpp b/health/aidl/default/Health.cpp
index 812e64abfc..e1d198221c 100644
--- a/health/aidl/default/Health.cpp
+++ b/health/aidl/default/Health.cpp
@@ -60,6 +60,8 @@ Health::Health(std::string_view instance_name, std::unique_ptr<struct healthd_co
     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 e49f44c7e4..6bd49465d6 100644
--- a/health/aidl/default/include/health-impl/Health.h
+++ b/health/aidl/default/include/health-impl/Health.h
@@ -43,6 +43,7 @@ class Health : public BnHealth, public HalHealthLoopCallback {
     // 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;