Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2cf8e0b authored by Ruchi Kandoi's avatar Ruchi Kandoi Committed by android-build-merger
Browse files

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

Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field" am: 7b0d1624 am: 9377a53a
am: 61d2a43f

Change-Id: Ibb35611f958bf9d1525e0b491860cbc87f1e1273
parents 108a492d 61d2a43f

core/java/android/nfc/NdefRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -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();