OOBR in HalCoreCallback am: 7b13a001f1 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/st/nfc/+/23180423 Change-Id: I5bbf1309292e5477793402171a8241c6a17aa821 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/st21nfc/hal/halcore.cc b/st21nfc/hal/halcore.cc index 13bc371..d705fd9 100644 --- a/st21nfc/hal/halcore.cc +++ b/st21nfc/hal/halcore.cc
@@ -118,7 +118,8 @@ STLOG_HAL_W( "length is illogical. Header length is %d, packet length %zu\n", data[2], length); - } else if (rf_deactivate_delay && data[0] == 0x00 && data[1] == 0x00) { + } else if (length > 1 && rf_deactivate_delay + && data[0] == 0x00 && data[1] == 0x00) { rf_deactivate_delay = false; }