commit 443877b859db3b451d9b14f264a43ba255a89fbd
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 25 06:19:15 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 25 06:19:15 2023 +0000
tree 2119a3f9ad8de83f7b1d9593744e03423e0e94b9
parent 57675f841c80c595f35bc61491d9be97aa60f2dc
parent 53828d661bd410c3040a4c02b2c448be45fd0a23

Merge "Handle a core reset notification received in HAL_WRAPPER_STATE_READY" into main am: 53828d661b

Original change: https://android-review.googlesource.com/c/platform/hardware/st/nfc/+/2719537

Change-Id: Ib17efd597da5882f556a76a191d32d954a077b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

st21nfc/hal_wrapper.cc

diff --git a/st21nfc/hal_wrapper.cc b/st21nfc/hal_wrapper.cc
index 571991f..ae94577 100644
--- a/st21nfc/hal_wrapper.cc
+++ b/st21nfc/hal_wrapper.cc
@@ -556,6 +556,10 @@
             HalSendDownstreamStopTimer(mHalHandle);
             mTimerStarted = false;
           }
+        } else if (p_data[0] == 0x60 && p_data[1] == 0x00) {
+          p_data[3] = 0x0;  // Only reset trigger that should be received in
+                            // HAL_WRAPPER_STATE_READY is unreocoverable error.
+
         } else if (data_len >= 4 && p_data[0] == 0x60 && p_data[1] == 0x07) {
           if (p_data[3] == 0xE1) {
             // Core Generic Error - Buffer Overflow Ntf - Restart all