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

Commit e2e4ea9e authored by Sylvain Fonteneau's avatar Sylvain Fonteneau Committed by Nick Pelly
Browse files

Fixed NdefTag parcelable conversion methods. 



Also removed call to obsolete openTagConnection() method which was crashing.

Change-Id: Iffd46bd5cad877bb3a82ede298e65ae98322dca9
Signed-off-by: default avatarNick Pelly <npelly@google.com>
parent 145550a0

core/java/android/nfc/NdefTag.java

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ public class NdefTag extends Tag implements Parcelable { 
        dest.writeStringArray(mNdefTargets);

        dest.writeInt(mMessages.length);

        for (NdefMessage[] ms : mMessages) {

            dest.writeInt(ms.length);

            dest.writeTypedArray(ms, flags);

        }

    }

core/java/android/nfc/RawTagConnection.java

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ public class RawTagConnection { 


        mService = service;

        mTagService = service.getNfcTagInterface();

        mService.openTagConnection(tag);  // TODO(nxp): don't connect until connect()

        mTag = tag;

        mSelectedTarget = target;

    }

core/java/android/nfc/Tag.java

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public class Tag implements Parcelable { 
    /*package*/ static byte[] readBytesWithNull(Parcel in) {

        int len = in.readInt();

        byte[] result = null;

        if (len > 0) {

        if (len >= 0) {

            result = new byte[len];

            in.readByteArray(result);

        }