From 3fcedf77286a078ebd7ac8c082365bd80703dfdc Mon Sep 17 00:00:00 2001
From: Nick Pelly <npelly@google.com>
Date: Thu, 27 Jan 2011 14:47:02 -0800
Subject: [PATCH] API: Make close() throw an IOException.

IOException on close() can be useful to indicate that in-progress transactions
were canceled.

I also audited all of our tech classes to make sure every function that needs
to throw IOException does so.

Change-Id: Iaa9c43d79d59ff85772d5c3e4b4d57a6fa8df4cf
---
 api/current.xml                                    | 6 ++++++
 core/java/android/nfc/tech/BasicTagTechnology.java | 2 +-
 core/java/android/nfc/tech/IsoDep.java             | 2 +-
 core/java/android/nfc/tech/TagTechnology.java      | 5 +++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index f0b0233c2d891..ad54650d5cc2a 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -101107,6 +101107,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<exception name="IOException" type="java.io.IOException">
+</exception>
 </method>
 <method name="connect"
  return="void"
@@ -102205,6 +102207,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<implements name="java.io.Closeable">
+</implements>
 <method name="close"
  return="void"
  abstract="true"
@@ -102215,6 +102219,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<exception name="IOException" type="java.io.IOException">
+</exception>
 </method>
 <method name="connect"
  return="void"
diff --git a/core/java/android/nfc/tech/BasicTagTechnology.java b/core/java/android/nfc/tech/BasicTagTechnology.java
index e635f21598c56..32a850d24ec53 100644
--- a/core/java/android/nfc/tech/BasicTagTechnology.java
+++ b/core/java/android/nfc/tech/BasicTagTechnology.java
@@ -117,7 +117,7 @@ import java.io.IOException;
     }
 
     @Override
-    public void close() {
+    public void close() throws IOException {
         try {
             /* Note that we don't want to physically disconnect the tag,
              * but just reconnect to it to reset its state
diff --git a/core/java/android/nfc/tech/IsoDep.java b/core/java/android/nfc/tech/IsoDep.java
index f6d141aa49db1..774982ed88e68 100644
--- a/core/java/android/nfc/tech/IsoDep.java
+++ b/core/java/android/nfc/tech/IsoDep.java
@@ -92,7 +92,7 @@ public final class IsoDep extends BasicTagTechnology {
     }
 
     @Override
-    public void close() {
+    public void close() throws IOException {
         try {
             mTag.getTagService().resetIsoDepTimeout();
         } catch (RemoteException e) {
diff --git a/core/java/android/nfc/tech/TagTechnology.java b/core/java/android/nfc/tech/TagTechnology.java
index aebb3e8fd5369..c8ccdcf5ed8f1 100644
--- a/core/java/android/nfc/tech/TagTechnology.java
+++ b/core/java/android/nfc/tech/TagTechnology.java
@@ -18,9 +18,10 @@ package android.nfc.tech;
 
 import android.nfc.Tag;
 
+import java.io.Closeable;
 import java.io.IOException;
 
-public interface TagTechnology {
+public interface TagTechnology extends Closeable {
     /**
      * This technology is an instance of {@link NfcA}.
      * <p>Support for this technology type is mandatory.
@@ -135,5 +136,5 @@ public interface TagTechnology {
      * @see #connect()
      * @see #reconnect()
      */
-    public void close();
+    public void close() throws IOException;
 }