From 266e0a387123773538d7768a63d37793500169a1 Mon Sep 17 00:00:00 2001
From: Mathias Jeppsson <mathias.jeppsson@sonymobile.com>
Date: Fri, 2 Nov 2012 15:26:09 +0100
Subject: 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
---
 core/java/android/nfc/tech/Ndef.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'core/java/android')

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;
             }
-- 
cgit v1.1