Merge 34afc2cd from gingerbread-plus-aosp (bf9f3ea7) · Commits · e / os / android_frameworks_base

api/current.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -118820,6 +118820,8 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="connect"
		return="void"
		@@ -119918,6 +119920,8 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<implements name="java.io.Closeable">
		</implements>
		<method name="close"
		return="void"
		abstract="true"
		@@ -119928,6 +119932,8 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="connect"
		return="void"

+1 −1

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {

+3 −2

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