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

Merge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83

Browse Source 
am: 0d9dfc4314

Change-Id: I8e3caa6df525879b820f0611ec751d18df3eb94f
This commit is contained in:
Yuka Anami
2017-05-26 22:23:53 +00:00
committed by android-build-merger
parent ca2cec4754 0d9dfc4314
commit 269cb38bb9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -938,7 +938,7 @@ public final class NdefRecord implements Parcelable {
*/
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 @@ public final class NdefRecord implements Parcelable {
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;