tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "health impl: compare interfaces with their binders" am: 1f5c57c965

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1875175

Change-Id: I9e926639f105fac49cee127b60f8c24d8ede2354
This commit is contained in:
Yifan Hong 2021-10-29 21:18:58 +00:00 committed by Automerger Merge Worker
commit e1bc376ed4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
health/aidl/default/Health.cpp
View file

@ -261,7 +261,7 @@ ndk::ScopedAStatus Health::unregisterCallback(
std::lock_guard<decltype(callbacks_lock_)> lock(callbacks_lock_);
auto matches = [callback](const auto& linked) {
return linked->callback() == callback; // compares shared_ptr
return linked->callback()->asBinder() == callback->asBinder(); // compares binder object
};
auto it = std::remove_if(callbacks_.begin(), callbacks_.end(), matches);
bool removed = (it != callbacks_.end());