diff options
| author | Martijn Coenen <maco@google.com> | 2014-03-06 16:15:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 16:15:19 +0000 |
| commit | 4d328a79bdee417c1248660b1c33b5cd86dbd814 (patch) | |
| tree | a516a5e0859e33f20f02b302c36ede0f9759e94a /core/java/android/nfc/tech | |
| parent | 2fab2f63676af8a8f45fd303b255c88761c4f224 (diff) | |
| parent | a43f7cb01e3638607949465d7a872bd5b0ce7253 (diff) | |
| download | frameworks_base-4d328a79bdee417c1248660b1c33b5cd86dbd814.zip frameworks_base-4d328a79bdee417c1248660b1c33b5cd86dbd814.tar.gz frameworks_base-4d328a79bdee417c1248660b1c33b5cd86dbd814.tar.bz2 | |
am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field."
* commit 'a43f7cb01e3638607949465d7a872bd5b0ce7253':
NFC: getNdefMessage() should throw exception if no tag in field.
Diffstat (limited to 'core/java/android/nfc/tech')
| -rw-r--r-- | core/java/android/nfc/tech/Ndef.java | 2 |
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; } |