drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove timeout support." into gingerbread

Browse Source
This commit is contained in:
Nick Pelly
2010-11-02 14:46:46 -07:00
committed by Android (Google) Code Review
parent c1fad4a2e3 275708c82c
commit 38e561dd3c
4 changed files with 0 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/nfc/ILlcpServiceSocket.aidl
View File

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

2
core/java/android/nfc/ILlcpSocket.aidl
View File

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

28
core/java/com/android/internal/nfc/LlcpServiceSocket.java
View File

@ -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 * Close the created Llcp Service socket
*/ */

28
core/java/com/android/internal/nfc/LlcpSocket.java
View File

@ -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 * Disconnect request to the connected LLCP socket and close the created
* socket. * socket.