diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-03-07 01:27:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-07 01:27:18 +0000 |
| commit | 7b0d16249ca25b3bfcd3d3e47f7108282aa5c699 (patch) | |
| tree | 582457d3ccab9895f5994e343008417e95d9ca25 /core/java/android | |
| parent | 121006f42895a6fdd9e7d742aefdf6c2a154c6d8 (diff) | |
| parent | 2b527ac29323aa95c281c03335506f2a3d1beba4 (diff) | |
Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/nfc/NdefRecord.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java index bd3231464ccf..2c9ce3f99285 100644 --- a/core/java/android/nfc/NdefRecord.java +++ b/core/java/android/nfc/NdefRecord.java @@ -839,7 +839,7 @@ public final class NdefRecord implements Parcelable { 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(); |