Snap for 9157512 from 29cd62d7a8be1d4686a4b07b869ad481b8fc6844 to mainline-tzdata3-release

Change-Id: I10db69175822a4e3ec1ee3e8a018a9c8c54f2f5f
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";