From 2976da0305367ac051d0fcae160bfdb0497b2750 Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Thu, 29 Mar 2012 10:09:19 -0700
Subject: [PATCH] Allow formatting a tag as NDEF without a message.

Change-Id: I53a219eec17450b2d0ddc42556f0b930d9b34615
---
 core/java/android/nfc/tech/NdefFormatable.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/java/android/nfc/tech/NdefFormatable.java b/core/java/android/nfc/tech/NdefFormatable.java
index bb2eb943d46de..ffa6a2b575855 100644
--- a/core/java/android/nfc/tech/NdefFormatable.java
+++ b/core/java/android/nfc/tech/NdefFormatable.java
@@ -137,7 +137,12 @@ public final class NdefFormatable extends BasicTagTechnology {
                     throw new IOException();
             }
             // Now check and see if the format worked
-            if (tagService.isNdef(serviceHandle)) {
+            if (!tagService.isNdef(serviceHandle)) {
+                throw new IOException();
+            }
+
+            // Write a message, if one was provided
+            if (firstMessage != null) {
                 errorCode = tagService.ndefWrite(serviceHandle, firstMessage);
                 switch (errorCode) {
                     case ErrorCodes.SUCCESS:
@@ -150,9 +155,8 @@ public final class NdefFormatable extends BasicTagTechnology {
                         // Should not happen
                         throw new IOException();
                 }
-            } else {
-                throw new IOException();
             }
+
             // optionally make read-only
             if (makeReadOnly) {
                 errorCode = tagService.ndefMakeReadOnly(serviceHandle);