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

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.
 //

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;