| commit | 25004e48fc31aef0e91af03623f01d7c6896f0ed | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Aug 14 15:41:16 2023 -0700 |
| committer | Xin Li <delphij@google.com> | Mon Aug 14 15:41:16 2023 -0700 |
| tree | 40a57e0db0b04e7c16207e18d600154ad85c02f5 | |
| parent | f6a2148f0a7b2d630f05d2abe7e8347582ab5cf6 [diff] | |
| parent | 819c58515a40948c16a7169fb37e55044cd6daab [diff] |
Merge Android U (ab/10368041) Bug: 291102124 Merged-In: I685a21fe69e84db3a8fc0605a121f5f48c2ab5cd Change-Id: Ibcd7657cb1cfece301a26e634c819f43d5ad1897
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; }