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

Commit 73e8fd6b authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-20' into v1-t

parents cb3eb7cb db85bf2f

gps/android/utils/battery_listener.cpp

+8 −3
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ BatteryListenerImpl::~BatteryListenerImpl() 
{

    {

        std::lock_guard<std::mutex> _l(mLock);

        if (mHealth != NULL)

        if (mHealth != NULL) {

            mHealth->unregisterCallback(this);

            auto r = mHealth->unlinkToDeath(this);

            if (!r.isOk() || r == false) {
@@ -190,9 +190,12 @@ BatteryListenerImpl::~BatteryListenerImpl() 
                        r.description().c_str());

            }

        }

    }

    mDone = true;

    if (NULL !=  mThread) {

        mThread->join();

    }

}



void BatteryListenerImpl::serviceDied(uint64_t cookie __unused,

                                     const wp<hidl::base::V1_0::IBase>& who)
@@ -208,7 +211,9 @@ void BatteryListenerImpl::serviceDied(uint64_t cookie __unused, 
    }

    mHealth = NULL;

    mCond.notify_one();

    if (NULL !=  mThread) {

        mThread->join();

    }

    std::lock_guard<std::mutex> _l(mLock);

    init();

}

vintf/manifest.xml

+0 −9
Original line number Diff line number Diff line
@@ -36,15 +36,6 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl">

        <name>android.hardware.boot</name>

        <transport>hwbinder</transport>

        <version>1.0</version>

        <interface>

            <name>IBootControl</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl">

        <name>android.hardware.camera.provider</name>

        <transport>hwbinder</transport>