commit 29cd62d7a8be1d4686a4b07b869ad481b8fc6844
author Alisher Alikhodjaev <alisher@google.com> Fri Aug 05 22:40:00 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 05 22:40:00 2022 +0000
tree 3244ad9c651012fcb937ae7d8a0243b6d494a78e
parent 7b7755997f85f05bf35be8f193242687ecb12c5a
parent 38d8d7496edb147d01ad0c0c47eeec7ccbd9f11f

The length of a packet should be non-zero am: 396ac0e081 am: 6e2338cb88 am: 653f2de33b am: 84c29af749 am: 38d8d7496e

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/nfc/+/19504916

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

src/nfc/nfc/nfc_ncif.cc

diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc
index 96d5556..101b333 100644
--- a/src/nfc/nfc/nfc_ncif.cc
+++ b/src/nfc/nfc/nfc_ncif.cc
@@ -1469,14 +1469,14 @@
   tNFC_EE_DISCOVER_INFO* p_info;
   uint8_t u8;
 
-  DLOG_IF(INFO, nfc_debug_enabled)
-      << StringPrintf("nfc_ncif_proc_ee_discover_req %d len:%d", *p, plen);
-
   if (!plen) {
     android_errorWriteLog(0x534e4554, "221856662");
     return;
   }
 
+  DLOG_IF(INFO, nfc_debug_enabled)
+      << StringPrintf("nfc_ncif_proc_ee_discover_req %d len:%d", *p, plen);
+
   if (*p > NFC_MAX_EE_DISC_ENTRIES) {
     android_errorWriteLog(0x534e4554, "122361874");
     LOG(ERROR) << __func__ << "Exceed NFC_MAX_EE_DISC_ENTRIES";