summaryrefslogtreecommitdiffstats
path: root/sensors
diff options
context:
space:
mode:
authorAshutosh Joshi <ashutoshj@google.com>2017-03-10 12:53:31 -0800
committerAshutosh Joshi <ashutoshj@google.com>2017-03-10 12:53:31 -0800
commit2af9dacc3af8478139b63f7906e79f4f4d208d2c (patch)
tree4cd49ec4c5afa4f842b6000c4f50cd117cf85070 /sensors
parentb39197c5d11f828db73e093ad37a50cfb648bc9e (diff)
downloadandroid_hardware_interfaces-2af9dacc3af8478139b63f7906e79f4f4d208d2c.tar.gz
android_hardware_interfaces-2af9dacc3af8478139b63f7906e79f4f4d208d2c.tar.bz2
android_hardware_interfaces-2af9dacc3af8478139b63f7906e79f4f4d208d2c.zip
Do not crash fatally when recovering from system server restart.
Log(FATAL) is creating lots of nuisance bugs. Test: Sensor service continues to recover from a system server restart and sensors are available. No crash log is created. Bug: 36094522 Bug: 36115683 Change-Id: Idc2d086709dc2132c98aab806aa44728fbdaa189
Diffstat (limited to 'sensors')
-rw-r--r--sensors/1.0/default/Sensors.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/sensors/1.0/default/Sensors.cpp b/sensors/1.0/default/Sensors.cpp
index 37e2b81d9..24573109c 100644
--- a/sensors/1.0/default/Sensors.cpp
+++ b/sensors/1.0/default/Sensors.cpp
@@ -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) {