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

Commit dfeb5973 authored by Ashutosh Joshi's avatar Ashutosh Joshi Committed by Android (Google) Code Review
Browse files

Merge "Do not crash fatally when recovering from system server restart."

parents ed2bb4e8 2af9dacc

sensors/1.0/default/Sensors.cpp

+2 −1
Original line number Diff line number Diff line
@@ -165,8 +165,9 @@ Return<void> Sensors::poll(int32_t maxCount, poll_cb _hidl_cb) { 
        if(!lock.owns_lock()){

            // cannot get the lock, hidl service will go into deadlock if it is not restarted.

            // This is guaranteed to not trigger in passthrough mode.

            LOG(FATAL) <<

            LOG(ERROR) <<

                    "ISensors::poll() re-entry. I do not know what to do except killing myself.";

            ::exit(-1);

        }



        if (maxCount <= 0) {