Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am: 40c14a83d0 am: deac669a53"

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-01-25 20:12:59 +00:00
committed by Android (Google) Code Review
parent 260dedceda 2a13fbae73
commit 73c945de33
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/nfc/NdefRecord.java
View File

@@ -805,7 +805,7 @@ public final class NdefRecord implements Parcelable {
if (!mb && records.size() == 0 && !inChunk && !ignoreMbMe) {
throw new FormatException("expected MB flag");
} else if (mb && records.size() != 0 && !ignoreMbMe) {
} else if (mb && (records.size() != 0 || inChunk) && !ignoreMbMe) {
throw new FormatException("unexpected MB flag");
} else if (inChunk && il) {
throw new FormatException("unexpected IL flag in non-leading chunk");
@@ -839,6 +839,9 @@ public final class NdefRecord implements Parcelable {
if (cf && !inChunk) {
// first chunk
if (typeLength == 0) {
throw new FormatException("expected non-zero type length in first chunk");
}
chunks.clear();
chunkTnf = tnf;
}