summaryrefslogtreecommitdiffstats
path: root/core/java/android/nfc
diff options
context:
space:
mode:
authorMathias Jeppsson <mathias.jeppsson@sonymobile.com>2012-11-02 15:26:09 +0100
committerJohan Redestig <johan.redestig@sonymobile.com>2014-01-28 15:20:30 +0100
commit266e0a387123773538d7768a63d37793500169a1 (patch)
tree51fc31ec83acdf4ec307229048f13f23ccb18e58 /core/java/android/nfc
parent1ff4293e33f98e6dc19e4f154cb497af9bd88c9d (diff)
downloadframeworks_base-266e0a387123773538d7768a63d37793500169a1.zip
frameworks_base-266e0a387123773538d7768a63d37793500169a1.tar.gz
frameworks_base-266e0a387123773538d7768a63d37793500169a1.tar.bz2
NFC: getNdefMessage() should throw exception if no tag in field.
According to documentation, an TagLostException should be thrown, if the tag has been moved out of field when reading NDEF message. Change-Id: Ib7e485ed442027fdebd5bc7a46101fbca0c88bdb
Diffstat (limited to 'core/java/android/nfc')
-rw-r--r--core/java/android/nfc/tech/Ndef.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/nfc/tech/Ndef.java b/core/java/android/nfc/tech/Ndef.java
index 64aa299..f16dc3b 100644
--- a/core/java/android/nfc/tech/Ndef.java
+++ b/core/java/android/nfc/tech/Ndef.java
@@ -278,6 +278,8 @@ public final class Ndef extends BasicTagTechnology {
throw new TagLostException();
}
return msg;
+ } else if (!tagService.isPresent(serviceHandle)) {
+ throw new TagLostException();
} else {
return null;
}