commit 99c805b3193f64260982e2b9f5a26408b6a0c0a6
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 26 22:20:56 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 26 22:20:58 2017 +0000
tree 9942f46efe27f8eeba016731312e925a6cd8dc68
parent b1f0bb6f83be2e6458a7443e3a9b47af5e20472e
parent 5dc487d5888d2bfe7feee102f0753bcbe4464a76

Merge "Make NFC AIDL callbacks oneway"

core/java/android/nfc/NdefRecord.java

diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java
index 2c9ce3f..093a9b4 100644
--- a/core/java/android/nfc/NdefRecord.java
+++ b/core/java/android/nfc/NdefRecord.java
@@ -938,7 +938,7 @@
      */
     void writeToByteBuffer(ByteBuffer buffer, boolean mb, boolean me) {
         boolean sr = mPayload.length < 256;
-        boolean il = mId.length > 0;
+        boolean il = mTnf == TNF_EMPTY ? true : mId.length > 0;
 
         byte flags = (byte)((mb ? FLAG_MB : 0) | (me ? FLAG_ME : 0) |
                 (sr ? FLAG_SR : 0) | (il ? FLAG_IL : 0) | mTnf);
@@ -966,7 +966,7 @@
         int length = 3 + mType.length + mId.length + mPayload.length;
 
         boolean sr = mPayload.length < 256;
-        boolean il = mId.length > 0;
+        boolean il = mTnf == TNF_EMPTY ? true : mId.length > 0;
 
         if (!sr) length += 3;
         if (il) length += 1;