Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29060be7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "storaged: Fix double ownership for HealthInfoCallback." am: 3d0143dc am: 04b1e6e6 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2035103

Change-Id: I6602c07cd82844be0271b867d6c3a18d273c531b
parents 8d1457e2 04b1e6e6

storaged/storaged.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -153,7 +153,7 @@ void storaged_t::init_health_service() { 




    mUidm.init(is_charger_on(status));

    mUidm.init(is_charger_on(status));

    // register listener after init uid_monitor

    // 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);

    ret = health->registerCallback(aidl_health_callback);

    if (!ret.isOk()) {

    if (!ret.isOk()) {

        LOG(WARNING) << "health: failed to register callback: " << ret.getDescription();

        LOG(WARNING) << "health: failed to register callback: " << ret.getDescription();