diff options
| author | Martijn Coenen <maco@google.com> | 2014-03-06 16:21:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 16:21:46 +0000 |
| commit | ae2a35baf41290df626a17ba12cf1df6cb006a16 (patch) | |
| tree | f71fc1bb91dae087644131feae558d41dda77035 | |
| parent | 391d489ce0808630dd56b06259eb6e616bf79d94 (diff) | |
| parent | 4d328a79bdee417c1248660b1c33b5cd86dbd814 (diff) | |
| download | frameworks_base-ae2a35baf41290df626a17ba12cf1df6cb006a16.zip frameworks_base-ae2a35baf41290df626a17ba12cf1df6cb006a16.tar.gz frameworks_base-ae2a35baf41290df626a17ba12cf1df6cb006a16.tar.bz2 | |
am 4d328a79: am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field."
* commit '4d328a79bdee417c1248660b1c33b5cd86dbd814':
NFC: getNdefMessage() should throw exception if no tag in field.
| -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 8240ea6..5852ce4 100644 --- a/core/java/android/nfc/tech/Ndef.java +++ b/core/java/android/nfc/tech/Ndef.java @@ -277,6 +277,8 @@ public final class Ndef extends BasicTagTechnology { throw new TagLostException(); } return msg; + } else if (!tagService.isPresent(serviceHandle)) { + throw new TagLostException(); } else { return null; } |