| commit | a9c420d770ade82603dbe08b7b08a1847529b963 | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Fri Oct 29 22:08:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 29 22:08:42 2021 +0000 |
| tree | 17b20600dfd71d014533df03c3082179f41472db | |
| parent | b9af723682301d911221429bbd1e3c2b57ad2bda [diff] | |
| parent | f23ab16751b56cf37d7f43e6878d7d0e535ca731 [diff] |
Merge "health impl: compare interfaces with their binders" am: 1f5c57c965 am: e1bc376ed4 am: 2faf3adc25 am: f23ab16751 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1875175 Change-Id: I9048e10801efe3579b0e117dc1d5cf2457ac2dd8
diff --git a/health/aidl/default/Health.cpp b/health/aidl/default/Health.cpp index 2d91ce0..812e64a 100644 --- a/health/aidl/default/Health.cpp +++ b/health/aidl/default/Health.cpp
@@ -261,7 +261,7 @@ 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());