Merge "healthd: notify listeners using local copy of list, drop lock"

am: e29a6cda31

Change-Id: I94c6b076148c65e82ef13fc75b4be15b3e930901
This commit is contained in:
Todd Poynor 2017-06-29 22:29:36 +00:00 committed by android-build-merger
commit 51741d2f50

View file

@ -36,9 +36,19 @@ void BatteryPropertiesRegistrar::publish(
}
void BatteryPropertiesRegistrar::notifyListeners(const struct BatteryProperties& props) {
Mutex::Autolock _l(mRegistrationLock);
for (size_t i = 0; i < mListeners.size(); i++) {
mListeners[i]->batteryPropertiesChanged(props);
Vector<sp<IBatteryPropertiesListener> > listenersCopy;
// Binder currently may service an incoming oneway transaction whenever an
// outbound oneway call is made (if there is already a pending incoming
// oneway call waiting). This is considered a bug and may change in the
// future. For now, avoid recursive mutex lock while making outbound
// calls by making a local copy of the current list of listeners.
{
Mutex::Autolock _l(mRegistrationLock);
listenersCopy = mListeners;
}
for (size_t i = 0; i < listenersCopy.size(); i++) {
listenersCopy[i]->batteryPropertiesChanged(props);
}
}