commit 3d0143dc62f874deb0e31f8d635c652867ff8247
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 24 17:03:28 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 24 17:03:28 2022 +0000
tree cfbfe10c0603176e3103ab469f2f2d330ba0387d
parent c408ee943a1d9c486e4fac10bee7f76a61c75bab
parent f764aaf99844e486798d2e7943ea3985bcf90612

Merge "storaged: Fix double ownership for HealthInfoCallback."

storaged/storaged.cpp

diff --git a/storaged/storaged.cpp b/storaged/storaged.cpp
index fb855f7..8cc8b59 100644
--- a/storaged/storaged.cpp
+++ b/storaged/storaged.cpp
@@ -153,7 +153,7 @@
 
     mUidm.init(is_charger_on(status));
     // register listener after init uid_monitor
-    aidl_health_callback = std::make_shared<HealthInfoCallback>(&mUidm);
+    aidl_health_callback = ndk::SharedRefBase::make<HealthInfoCallback>(&mUidm);
     ret = health->registerCallback(aidl_health_callback);
     if (!ret.isOk()) {
         LOG(WARNING) << "health: failed to register callback: " << ret.getDescription();