From e2e4ea9ea8f5724403e6267d193a740dc7c78785 Mon Sep 17 00:00:00 2001 From: Sylvain Fonteneau Date: Mon, 25 Oct 2010 07:28:03 -0700 Subject: Fixed NdefTag parcelable conversion methods. Also removed call to obsolete openTagConnection() method which was crashing. Change-Id: Iffd46bd5cad877bb3a82ede298e65ae98322dca9 Signed-off-by: Nick Pelly --- core/java/android/nfc/NdefTag.java | 1 + core/java/android/nfc/RawTagConnection.java | 1 - core/java/android/nfc/Tag.java | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core/java/android') diff --git a/core/java/android/nfc/NdefTag.java b/core/java/android/nfc/NdefTag.java index d8681dc21798..0626edb1c5ca 100644 --- a/core/java/android/nfc/NdefTag.java +++ b/core/java/android/nfc/NdefTag.java @@ -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); } } diff --git a/core/java/android/nfc/RawTagConnection.java b/core/java/android/nfc/RawTagConnection.java index cf8283b762be..844289360b2e 100644 --- a/core/java/android/nfc/RawTagConnection.java +++ b/core/java/android/nfc/RawTagConnection.java @@ -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; } diff --git a/core/java/android/nfc/Tag.java b/core/java/android/nfc/Tag.java index f9205a629026..dc6e798e189e 100644 --- a/core/java/android/nfc/Tag.java +++ b/core/java/android/nfc/Tag.java @@ -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); } -- cgit v1.2.3