Do not throw SIGABORT on shutdown or HAL crash The SIGABORT stack dump confuses APC into thinking there is a crash in the nfc service. Bug: 195455309 Test: reboot, nfc on/off, tag read (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d6c829f55d677184d55bd3b7bc559c2fef4a24a6) Merged-In: I924ea426a67a3ae781207c958ba305b543ed4ded Change-Id: I924ea426a67a3ae781207c958ba305b543ed4ded
diff --git a/src/adaptation/NfcAdaptation.cc b/src/adaptation/NfcAdaptation.cc index d805fb0..711ae00 100644 --- a/src/adaptation/NfcAdaptation.cc +++ b/src/adaptation/NfcAdaptation.cc
@@ -191,7 +191,7 @@ mNfcDeathHal->unlinkToDeath(this); } mNfcDeathHal = NULL; - abort(); + exit(0); } void finalize() { if (mNfcDeathHal) { @@ -1065,7 +1065,7 @@ this); mAidlHal = nullptr; } - abort(); + exit(0); } // static