commit 1507c18f87da9906337237d34184d6ac8f1afabd
author Martijn Coenen <maco@google.com> Thu Mar 06 07:51:13 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 06 07:51:13 2014 -0800
tree d53c021ce7f44c51dea8ad2a0dc7990050cb89e6
parent 9a9916b58fb22da735d18a03beffb24b4d5cd9a3
parent 29e55bef771ee1453017fbf73bb4de62d356e4fc

am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field."

* commit '29e55bef771ee1453017fbf73bb4de62d356e4fc':
  NFC: getNdefMessage() should throw exception if no tag in field.

core/java/android/nfc/tech/Ndef.java

diff --git a/core/java/android/nfc/tech/Ndef.java b/core/java/android/nfc/tech/Ndef.java
index 64aa2996..f16dc3b 100644
--- a/core/java/android/nfc/tech/Ndef.java
+++ b/core/java/android/nfc/tech/Ndef.java
@@ -278,6 +278,8 @@
                     throw new TagLostException();
                 }
                 return msg;
+            } else if (!tagService.isPresent(serviceHandle)) {
+                throw new TagLostException();
             } else {
                 return null;
             }