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

Commit 3e6d3319 authored by Natalie Silvanovich's avatar Natalie Silvanovich
Browse files

NULL check in registerListener 

Prevents crash in batteryproperties. Now with two times as much NULL checking.

Bug: 13730158
Change-Id: Ica083da60c6543431c2d82d46aed48eaccc3b4b4
parent de4dea76

healthd/BatteryPropertiesRegistrar.cpp

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ void BatteryPropertiesRegistrar::notifyListeners(struct BatteryProperties props) 


void BatteryPropertiesRegistrar::registerListener(const sp<IBatteryPropertiesListener>& listener) {

    {

        if (listener == NULL)

            return;

        Mutex::Autolock _l(mRegistrationLock);

        // check whether this is a duplicate

        for (size_t i = 0; i < mListeners.size(); i++) {
@@ -58,6 +60,8 @@ void BatteryPropertiesRegistrar::registerListener(const sp<IBatteryPropertiesLis 
}



void BatteryPropertiesRegistrar::unregisterListener(const sp<IBatteryPropertiesListener>& listener) {

    if (listener == NULL)

        return;

    Mutex::Autolock _l(mRegistrationLock);

    for (size_t i = 0; i < mListeners.size(); i++) {

        if (mListeners[i]->asBinder() == listener->asBinder()) {