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

Commit bb63b4a3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add ID_LENGTH field for Empty type record" into oc-dev

parents bacaffa4 c03eaa68

core/java/android/nfc/NdefRecord.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -938,7 +938,7 @@ public final class NdefRecord implements Parcelable { 
     */

     */

    void writeToByteBuffer(ByteBuffer buffer, boolean mb, boolean me) {

    void writeToByteBuffer(ByteBuffer buffer, boolean mb, boolean me) {

        boolean sr = mPayload.length < 256;

        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) |

        byte flags = (byte)((mb ? FLAG_MB : 0) | (me ? FLAG_ME : 0) |

                (sr ? FLAG_SR : 0) | (il ? FLAG_IL : 0) | mTnf);

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

        int length = 3 + mType.length + mId.length + mPayload.length;





        boolean sr = mPayload.length < 256;

        boolean sr = mPayload.length < 256;

        boolean il = mId.length > 0;

        boolean il = mTnf == TNF_EMPTY ? true : mId.length > 0;





        if (!sr) length += 3;

        if (!sr) length += 3;

        if (il) length += 1;

        if (il) length += 1;