diff options
| author | Sylvain Fonteneau <sylvain.fonteneau@trusted-logic.com> | 2010-10-25 07:28:03 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-10-25 08:55:36 -0700 |
| commit | e2e4ea9ea8f5724403e6267d193a740dc7c78785 (patch) | |
| tree | 9bc539d6fafa52b06ab76760ef0d9f18582a4d15 | |
| parent | 145550a00ea59ff20133acc95315e463628e16db (diff) | |
| download | frameworks_base-e2e4ea9ea8f5724403e6267d193a740dc7c78785.zip frameworks_base-e2e4ea9ea8f5724403e6267d193a740dc7c78785.tar.gz frameworks_base-e2e4ea9ea8f5724403e6267d193a740dc7c78785.tar.bz2 | |
Fixed NdefTag parcelable conversion methods.
Also removed call to obsolete openTagConnection() method which was crashing.
Change-Id: Iffd46bd5cad877bb3a82ede298e65ae98322dca9
Signed-off-by: Nick Pelly <npelly@google.com>
| -rw-r--r-- | core/java/android/nfc/NdefTag.java | 1 | ||||
| -rw-r--r-- | core/java/android/nfc/RawTagConnection.java | 1 | ||||
| -rw-r--r-- | core/java/android/nfc/Tag.java | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/nfc/NdefTag.java b/core/java/android/nfc/NdefTag.java index d8681dc..0626edb 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 cf8283b..8442893 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 f9205a6..dc6e798 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); } |