Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field" am: 7b0d16249c am: 9377a53aa9

am: 61d2a43fa9

Change-Id: Ibb35611f958bf9d1525e0b491860cbc87f1e1273
This commit is contained in:
Ruchi Kandoi
2017-03-07 02:59:38 +00:00
committed by android-build-merger

View File

@@ -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();