diff options
author | Nick Pelly <npelly@google.com> | 2010-11-02 14:49:35 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-02 14:49:35 -0700 |
commit | 6fb9316f6bd72b406bbfc61bd210281744eea9c1 (patch) | |
tree | 920ee6dae22ff5dc2ae23331cd2eb30a5f3b02b3 /core | |
parent | c91e46730d14611fb85cd7b2d3e51dac5ce538a2 (diff) | |
parent | 38e561dd3cd72160035d8b3002fc9bbaf3071374 (diff) | |
download | frameworks_base-6fb9316f6bd72b406bbfc61bd210281744eea9c1.zip frameworks_base-6fb9316f6bd72b406bbfc61bd210281744eea9c1.tar.gz frameworks_base-6fb9316f6bd72b406bbfc61bd210281744eea9c1.tar.bz2 |
am 38e561dd: Merge "Remove timeout support." into gingerbread
* commit '38e561dd3cd72160035d8b3002fc9bbaf3071374':
Remove timeout support.
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/nfc/ILlcpServiceSocket.aidl | 2 | ||||
-rw-r--r-- | core/java/android/nfc/ILlcpSocket.aidl | 2 | ||||
-rw-r--r-- | core/java/com/android/internal/nfc/LlcpServiceSocket.java | 28 | ||||
-rw-r--r-- | core/java/com/android/internal/nfc/LlcpSocket.java | 28 |
4 files changed, 0 insertions, 60 deletions
diff --git a/core/java/android/nfc/ILlcpServiceSocket.aidl b/core/java/android/nfc/ILlcpServiceSocket.aidl index c3108dc..581c21d 100644 --- a/core/java/android/nfc/ILlcpServiceSocket.aidl +++ b/core/java/android/nfc/ILlcpServiceSocket.aidl @@ -23,6 +23,4 @@ interface ILlcpServiceSocket { int accept(int nativeHandle); void close(int nativeHandle); - int getAcceptTimeout(int nativeHandle); - void setAcceptTimeout(int nativeHandle, int timeout); } diff --git a/core/java/android/nfc/ILlcpSocket.aidl b/core/java/android/nfc/ILlcpSocket.aidl index dda5628..3166e72 100644 --- a/core/java/android/nfc/ILlcpSocket.aidl +++ b/core/java/android/nfc/ILlcpSocket.aidl @@ -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 diff --git a/core/java/com/android/internal/nfc/LlcpServiceSocket.java b/core/java/com/android/internal/nfc/LlcpServiceSocket.java index 318982b..d616860 100644 --- a/core/java/com/android/internal/nfc/LlcpServiceSocket.java +++ b/core/java/com/android/internal/nfc/LlcpServiceSocket.java @@ -122,34 +122,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 */ public void close() { diff --git a/core/java/com/android/internal/nfc/LlcpSocket.java b/core/java/com/android/internal/nfc/LlcpSocket.java index b1b1320..73c0925 100644 --- a/core/java/com/android/internal/nfc/LlcpSocket.java +++ b/core/java/com/android/internal/nfc/LlcpSocket.java @@ -140,34 +140,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. * |