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

This commit is contained in:
Ashutosh Joshi
2017-03-10 23:15:37 +00:00
committed by Android (Google) Code Review

View File

@@ -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) {