commit 2b527ac29323aa95c281c03335506f2a3d1beba4
author Ruchi Kandoi <kandoiruchi@google.com> Fri Feb 03 14:01:09 2017 -0800
committer Ruchi Kandoi <kandoiruchi@google.com> Mon Mar 06 13:10:20 2017 -0800
tree 73ba5789adedb3b8840b635e24c8b5bc083a6b8d
parent 3a3cd0a27f98a360fad69030eedacd0d863586b4

nfc: First chunked NDEF record of TNF doesn't contain the type field

Test: CTS test passes
Bug: 34943312
Change-Id: I08f37ee76810f642b35ae8bde05ef0e2eff921e0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>

core/java/android/nfc/NdefRecord.java

diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java
index bd32314..2c9ce3f 100644
--- a/core/java/android/nfc/NdefRecord.java
+++ b/core/java/android/nfc/NdefRecord.java
@@ -839,7 +839,7 @@
 
                 if (cf && !inChunk) {
                     // first chunk
-                    if (typeLength == 0) {
+                    if (typeLength == 0 && tnf != NdefRecord.TNF_UNKNOWN) {
                         throw new FormatException("expected non-zero type length in first chunk");
                     }
                     chunks.clear();