am 6fb9316f: am 38e561dd: Merge "Remove timeout support." into gingerbread (cc82f3ae) · Commits · e / os / android_frameworks_base

core/java/android/nfc/ILlcpServiceSocket.aidl

+0 −2

Original line number	Diff line number	Diff line
		@@ -23,6 +23,4 @@ interface ILlcpServiceSocket
		{
		int accept(int nativeHandle);
		void close(int nativeHandle);
		int getAcceptTimeout(int nativeHandle);
		void setAcceptTimeout(int nativeHandle, int timeout);
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ interface ILlcpSocket
		int close(int nativeHandle);
		int connect(int nativeHandle, int sap);
		int connectByName(int nativeHandle, String sn);
		int getConnectTimeout(int nativeHandle);
		int getLocalSap(int nativeHandle);
		int getLocalSocketMiu(int nativeHandle);
		int getLocalSocketRw(int nativeHandle);
		@@ -32,5 +31,4 @@ interface ILlcpSocket
		int getRemoteSocketRw(int nativeHandle);
		int receive(int nativeHandle, out byte[] receiveBuffer);
		int send(int nativeHandle, in byte[] data);
		void setConnectTimeout(int nativeHandle, int timeout);
		}
		No newline at end of file

+0 −28

Original line number	Diff line number	Diff line
		@@ -121,34 +121,6 @@ public class LlcpServiceSocket {

		}

		/**
		* Set the timeout for the accept request
		*
		* @param timeout
		* value of the timeout for the accept request
		*/
		public void setAcceptTimeout(int timeout) {
		try {
		mService.setAcceptTimeout(mHandle, timeout);
		} catch (RemoteException e) {
		Log.e(TAG, "RemoteException in setAcceptTimeout(): ", e);
		}
		}

		/**
		* Get the timeout value of the accept request
		*
		* @return mTimeout
		*/
		public int getAcceptTimeout() {
		try {
		return mService.getAcceptTimeout(mHandle);
		} catch (RemoteException e) {
		Log.e(TAG, "RemoteException in getAcceptTimeout(): ", e);
		return 0;
		}
		}

		/**
		* Close the created Llcp Service socket
		*/

+0 −28

Original line number	Diff line number	Diff line
		@@ -139,34 +139,6 @@ public class LlcpSocket {
		}
		}

		/**
		* Set the timeout for the connect request
		*
		* @param timeout
		* timeout value for the connect request
		*/
		public void setConnectTimeout(int timeout) {
		try {
		mService.setConnectTimeout(mHandle, timeout);
		} catch (RemoteException e) {
		Log.e(TAG, "RemoteException in setConnectTimeout(): ", e);
		}
		}

		/**
		* Get the timeout value of the connect request
		*
		* @return mTimeout
		*/
		public int getConnectTimeout() {
		try {
		return mService.getConnectTimeout(mHandle);
		} catch (RemoteException e) {
		Log.e(TAG, "RemoteException in getConnectTimeout(): ", e);
		return 0;
		}
		}

		/**
		* Disconnect request to the connected LLCP socket and close the created
		* socket.