ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

storaged: Fix double ownership for HealthInfoCallback.

Browse source 
SharedRefBase objects can only be created via
SharedRefBase::make, not std::make_shared. Otherwise
there'll be a double-ownership problem.

Test: TH
Fixes: 225448524
Change-Id: I856677626cb146eb52a5b4a4562148e899d5a57b
This commit is contained in:
Yifan Hong 2022-03-21 15:15:12 -07:00
parent 8461ca5945
commit f764aaf998
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storaged/storaged.cpp
View file

@ -153,7 +153,7 @@ void storaged_t::init_health_service() {
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();