Commit 4d328a79 authored Mar 06, 2014 by Martijn Coenen Committed by Android Git Automerger Mar 06, 2014

am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should...

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

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

parents 2fab2f63 a43f7cb0

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}