diff options
| author | Roshan Pius <rpius@google.com> | 2024-02-14 12:48:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-14 12:48:54 +0000 |
| commit | c916726ab2638a19682e25e3e05de9ac680a9b99 (patch) | |
| tree | 20b19754fed7a4494812173bf2bde2b76bfdf745 | |
| parent | cbf1fe8e760509f4fe2ed54c7cb6bcf1b0880406 (diff) | |
| parent | 5418181573590e96bd366c4641776ce11ebfc64b (diff) | |
| download | Nfc-c916726ab2638a19682e25e3e05de9ac680a9b99.tar.gz | |
Merge "Fix for MW not sending response in case of felica from host transaction with empty data" into main am: 5418181573
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/2940625
Change-Id: I79d1251dedc5f1a4087c31ba89961838215655a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/android/nfc/cardemulation/HostNfcFEmulationManager.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/nfc/cardemulation/HostNfcFEmulationManager.java b/src/com/android/nfc/cardemulation/HostNfcFEmulationManager.java index 9c8963b6..1aa9b327 100644 --- a/src/com/android/nfc/cardemulation/HostNfcFEmulationManager.java +++ b/src/com/android/nfc/cardemulation/HostNfcFEmulationManager.java @@ -361,13 +361,10 @@ public class HostNfcFEmulationManager { } byte[] data = dataBundle.getByteArray("data"); if (data == null) { + Log.e(TAG, "Data is null"); return; } - if (data.length == 0) { - Log.e(TAG, "Invalid response packet"); - return; - } - if (data.length != (data[0] & 0xff)) { + if (data.length != 0 && (data.length != (data[0] & 0xff))) { Log.e(TAG, "Invalid response packet"); return; } |