DivestOS/Patches/LineageOS-16.0/android_system_nfc/342098.patch

38 lines
1.2 KiB
Diff
Raw Normal View History

16.0: Import and verify picks https://review.lineageos.org/q/topic:P_asb_2022-05 https://review.lineageos.org/q/topic:P_asb_2022-06 https://review.lineageos.org/q/topic:P_asb_2022-07 https://review.lineageos.org/q/topic:P_asb_2022-08 https://review.lineageos.org/q/topic:P_asb_2022-09 https://review.lineageos.org/q/topic:P_asb_2022-10 https://review.lineageos.org/q/topic:P_asb_2022-11 https://review.lineageos.org/q/topic:P_asb_2022-12 https://review.lineageos.org/q/topic:P_asb_2023-01 https://review.lineageos.org/q/topic:P_asb_2023-02 https://review.lineageos.org/q/topic:P_asb_2023-03 https://review.lineageos.org/q/topic:P_asb_2023-04 https://review.lineageos.org/q/topic:P_asb_2023-05 https://review.lineageos.org/q/topic:P_asb_2023-06 https://review.lineageos.org/q/topic:P_asb_2023-07 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/361250 https://review.lineageos.org/q/topic:P_asb_2023-08 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/364606 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/365328 https://review.lineageos.org/q/topic:P_asb_2023-09 https://review.lineageos.org/q/topic:P_asb_2023-10 https://review.lineageos.org/q/topic:P_asb_2023-11 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/374916 https://review.lineageos.org/q/topic:P_asb_2023-12 https://review.lineageos.org/q/topic:P_asb_2024-01 https://review.lineageos.org/q/topic:P_asb_2024-02 https://review.lineageos.org/q/topic:P_asb_2024-03 https://review.lineageos.org/q/topic:P_asb_2024-04 Signed-off-by: Tavi <tavi@divested.dev>
2024-05-07 23:13:31 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alisher Alikhodjaev <alisher@google.com>
Date: Tue, 2 Aug 2022 13:32:30 -0700
Subject: [PATCH] The length of a packet should be non-zero
Bug: 221856662
Bug: 237079835
Test: no functional changes, the build is ok
Change-Id: I6defe4025c962ae7dde2e673e2bfcfc15785cc12
(cherry picked from commit 396ac0e081ae67a1d743e0373257ec869692912c)
Merged-In: I6defe4025c962ae7dde2e673e2bfcfc15785cc12
---
src/nfc/nfc/nfc_ncif.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc
index 4bb6ba6..fafd0c1 100644
--- a/src/nfc/nfc/nfc_ncif.cc
+++ b/src/nfc/nfc/nfc_ncif.cc
@@ -1177,14 +1177,14 @@ void nfc_ncif_proc_ee_discover_req(uint8_t* p, uint16_t plen) {
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_cback) {
u8 = *p;
ee_disc_req.status = NFC_STATUS_OK;