diff options
| author | Martijn Coenen <maco@google.com> | 2014-03-06 14:33:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-06 14:33:11 +0000 |
| commit | 29e55bef771ee1453017fbf73bb4de62d356e4fc (patch) | |
| tree | 1578f47fa781cc776cb9c4538ff881e93953f12a /core | |
| parent | 2383f2200ab0c2dbd71708b5c1fb6af98db408fa (diff) | |
| parent | 266e0a387123773538d7768a63d37793500169a1 (diff) | |
| download | frameworks_base-29e55bef771ee1453017fbf73bb4de62d356e4fc.zip frameworks_base-29e55bef771ee1453017fbf73bb4de62d356e4fc.tar.gz frameworks_base-29e55bef771ee1453017fbf73bb4de62d356e4fc.tar.bz2 | |
Merge "NFC: getNdefMessage() should throw exception if no tag in field."
Diffstat (limited to 'core')
| -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; } |