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

am b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.

Browse Source 
* commit 'b79173f6602359d00a1a89f4d6505a44d461d796':
  Changed technology close() to reconnect to the tag instead of physical disconnect.
This commit is contained in:
Martijn Coenen
2010-12-10 20:40:40 -08:00
committed by Android Git Automerger
parent 2019f53396 b79173f660
commit 41e74b991b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/nfc/INfcTag.aidl
View File

@ -25,6 +25,7 @@ interface INfcTag
{ {
int close(int nativeHandle); int close(int nativeHandle);
int connect(int nativeHandle); int connect(int nativeHandle);
int reconnect(int nativeHandle);
int[] getTechList(int nativeHandle); int[] getTechList(int nativeHandle);
byte[] getUid(int nativeHandle); byte[] getUid(int nativeHandle);
boolean isNdef(int nativeHandle); boolean isNdef(int nativeHandle);

5
core/java/android/nfc/technology/BasicTagTechnology.java
View File

@ -162,7 +162,10 @@ import android.util.Log;
public void close() { public void close() {
mIsConnected = false; mIsConnected = false;
try { try {
mTagService.close(mTag.getServiceHandle()); /* Note that we don't want to physically disconnect the tag,
* but just reconnect to it to reset its state
*/
mTagService.reconnect(mTag.getServiceHandle());
} catch (RemoteException e) { } catch (RemoteException e) {
attemptDeadServiceRecovery(e); attemptDeadServiceRecovery(e);
} }