Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add getMaxTransceiveLength() API."

Browse Source
This commit is contained in:
Martijn Coenen
2011-08-26 16:36:29 -07:00
committed by Android (Google) Code Review
parent 4c340652f8 faca12adc6
commit 6a85a48831
12 changed files with 129 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/current.txt
View File

@@ -12465,6 +12465,7 @@ package android.nfc.tech {
method public static android.nfc.tech.IsoDep get(android.nfc.Tag);
method public byte[] getHiLayerResponse();
method public byte[] getHistoricalBytes();
method public int getMaxTransceiveLength();
method public void setTimeout(int);
method public byte[] transceive(byte[]) throws java.io.IOException;
}
@@ -12477,6 +12478,7 @@ package android.nfc.tech {
method public static android.nfc.tech.MifareClassic get(android.nfc.Tag);
method public int getBlockCount();
method public int getBlockCountInSector(int);
method public int getMaxTransceiveLength();
method public int getSectorCount();
method public int getSize();
method public int getType();
@@ -12503,6 +12505,7 @@ package android.nfc.tech {
public final class MifareUltralight extends android.nfc.tech.BasicTagTechnology {
method public static android.nfc.tech.MifareUltralight get(android.nfc.Tag);
method public int getMaxTransceiveLength();
method public int getType();
method public byte[] readPages(int) throws java.io.IOException;
method public byte[] transceive(byte[]) throws java.io.IOException;
@@ -12539,6 +12542,7 @@ package android.nfc.tech {
public final class NfcA extends android.nfc.tech.BasicTagTechnology {
method public static android.nfc.tech.NfcA get(android.nfc.Tag);
method public byte[] getAtqa();
method public int getMaxTransceiveLength();
method public short getSak();
method public byte[] transceive(byte[]) throws java.io.IOException;
}
@@ -12546,6 +12550,7 @@ package android.nfc.tech {
public final class NfcB extends android.nfc.tech.BasicTagTechnology {
method public static android.nfc.tech.NfcB get(android.nfc.Tag);
method public byte[] getApplicationData();
method public int getMaxTransceiveLength();
method public byte[] getProtocolInfo();
method public byte[] transceive(byte[]) throws java.io.IOException;
}
@@ -12553,6 +12558,7 @@ package android.nfc.tech {
public final class NfcF extends android.nfc.tech.BasicTagTechnology {
method public static android.nfc.tech.NfcF get(android.nfc.Tag);
method public byte[] getManufacturer();
method public int getMaxTransceiveLength();
method public byte[] getSystemCode();
method public byte[] transceive(byte[]) throws java.io.IOException;
}
@@ -12560,6 +12566,7 @@ package android.nfc.tech {
public final class NfcV extends android.nfc.tech.BasicTagTechnology {
method public static android.nfc.tech.NfcV get(android.nfc.Tag);
method public byte getDsfId();
method public int getMaxTransceiveLength();
method public byte getResponseFlags();
method public byte[] transceive(byte[]) throws java.io.IOException;
}

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

@@ -46,4 +46,6 @@ interface INfcTag
int setTimeout(int technology, int timeout);
int getTimeout(int technology);
void resetTimeouts();
boolean canMakeReadOnly(int ndefType);
int getMaxTransceiveLength(int technology);
}

51
core/java/android/nfc/TransceiveResult.java
View File

@@ -19,33 +19,38 @@ package android.nfc;
import android.os.Parcel;
import android.os.Parcelable;
import java.io.IOException;
/**
* Class used to pipe transceive result from the NFC service.
*
* @hide
*/
public final class TransceiveResult implements Parcelable {
private final boolean mTagLost;
private final boolean mSuccess;
private final byte[] mResponseData;
public static final int RESULT_SUCCESS = 0;
public static final int RESULT_FAILURE = 1;
public static final int RESULT_TAGLOST = 2;
public static final int RESULT_EXCEEDED_LENGTH = 3;
public TransceiveResult(final boolean success, final boolean tagIsLost,
final byte[] data) {
mSuccess = success;
mTagLost = tagIsLost;
final int mResult;
final byte[] mResponseData;
public TransceiveResult(final int result, final byte[] data) {
mResult = result;
mResponseData = data;
}
public boolean isSuccessful() {
return mSuccess;
}
public boolean isTagLost() {
return mTagLost;
}
public byte[] getResponseData() {
return mResponseData;
public byte[] getResponseOrThrow() throws IOException {
switch (mResult) {
case RESULT_SUCCESS:
return mResponseData;
case RESULT_TAGLOST:
throw new TagLostException("Tag was lost.");
case RESULT_EXCEEDED_LENGTH:
throw new IOException("Transceive length exceeds supported maximum");
default:
throw new IOException("Transceive failed");
}
}
@Override
@@ -55,9 +60,8 @@ public final class TransceiveResult implements Parcelable {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(mSuccess ? 1 : 0);
dest.writeInt(mTagLost ? 1 : 0);
if (mSuccess) {
dest.writeInt(mResult);
if (mResult == RESULT_SUCCESS) {
dest.writeInt(mResponseData.length);
dest.writeByteArray(mResponseData);
}
@@ -67,18 +71,17 @@ public final class TransceiveResult implements Parcelable {
new Parcelable.Creator<TransceiveResult>() {
@Override
public TransceiveResult createFromParcel(Parcel in) {
boolean success = (in.readInt() == 1) ? true : false;
boolean tagLost = (in.readInt() == 1) ? true : false;
int result = in.readInt();
byte[] responseData;
if (success) {
if (result == RESULT_SUCCESS) {
int responseLength = in.readInt();
responseData = new byte[responseLength];
in.readByteArray(responseData);
} else {
responseData = null;
}
return new TransceiveResult(success, tagLost, responseData);
return new TransceiveResult(result, responseData);
}
@Override

20
core/java/android/nfc/tech/BasicTagTechnology.java
View File

@@ -129,6 +129,15 @@ import java.io.IOException;
}
}
/** Internal getMaxTransceiveLength() */
int getMaxTransceiveLengthInternal() {
try {
return mTag.getTagService().getMaxTransceiveLength(mSelectedTechnology);
} catch (RemoteException e) {
Log.e(TAG, "NFC service dead", e);
return 0;
}
}
/** Internal transceive */
/*package*/ byte[] transceive(byte[] data, boolean raw) throws IOException {
checkConnected();
@@ -139,16 +148,7 @@ import java.io.IOException;
if (result == null) {
throw new IOException("transceive failed");
} else {
if (result.isSuccessful()) {
return result.getResponseData();
} else {
if (result.isTagLost()) {
throw new TagLostException("Tag was lost.");
}
else {
throw new IOException("transceive failed");
}
}
return result.getResponseOrThrow();
}
} catch (RemoteException e) {
Log.e(TAG, "NFC service dead", e);

11
core/java/android/nfc/tech/IsoDep.java
View File

@@ -156,6 +156,9 @@ public final class IsoDep extends BasicTagTechnology {
* will be automatically fragmented and defragmented by {@link #transceive} if
* it exceeds FSD/FSC limits.
*
* <p>Use {@link #getMaxTransceiveLength} to retrieve the maximum number of bytes
* that can be sent with {@link #transceive}.
*
* <p>This is an I/O operation and will block until complete. It must
* not be called from the main application thread. A blocked call will be canceled with
* {@link IOException} if {@link #close} is called from another thread.
@@ -170,4 +173,12 @@ public final class IsoDep extends BasicTagTechnology {
public byte[] transceive(byte[] data) throws IOException {
return transceive(data, true);
}
/**
* Return the maximum number of bytes that can be sent with {@link #transceive}.
* @return the maximum number of bytes that can be sent with {@link #transceive}.
*/
public int getMaxTransceiveLength() {
return getMaxTransceiveLengthInternal();
}
}

11
core/java/android/nfc/tech/MifareClassic.java
View File

@@ -560,6 +560,9 @@ public final class MifareClassic extends BasicTagTechnology {
* and calling {@link NfcA#transceive}. Note that all MIFARE Classic
* tags are based on {@link NfcA} technology.
*
* <p>Use {@link #getMaxTransceiveLength} to retrieve the maximum number of bytes
* that can be sent with {@link #transceive}.
*
* <p>This is an I/O operation and will block until complete. It must
* not be called from the main application thread. A blocked call will be canceled with
* {@link IOException} if {@link #close} is called from another thread.
@@ -572,6 +575,14 @@ public final class MifareClassic extends BasicTagTechnology {
return transceive(data, true);
}
/**
* Return the maximum number of bytes that can be sent with {@link #transceive}.
* @return the maximum number of bytes that can be sent with {@link #transceive}.
*/
public int getMaxTransceiveLength() {
return getMaxTransceiveLengthInternal();
}
/**
* Set the timeout of {@link #transceive} in milliseconds.
* <p>The timeout only applies to MifareUltralight {@link #transceive},

11
core/java/android/nfc/tech/MifareUltralight.java
View File

@@ -200,6 +200,9 @@ public final class MifareUltralight extends BasicTagTechnology {
* and calling {@link NfcA#transceive}. Note that all MIFARE Classic
* tags are based on {@link NfcA} technology.
*
* <p>Use {@link #getMaxTransceiveLength} to retrieve the maximum number of bytes
* that can be sent with {@link #transceive}.
*
* <p>This is an I/O operation and will block until complete. It must
* not be called from the main application thread. A blocked call will be canceled with
* {@link IOException} if {@link #close} is called from another thread.
@@ -212,6 +215,14 @@ public final class MifareUltralight extends BasicTagTechnology {
return transceive(data, true);
}
/**
* Return the maximum number of bytes that can be sent with {@link #transceive}.
* @return the maximum number of bytes that can be sent with {@link #transceive}.
*/
public int getMaxTransceiveLength() {
return getMaxTransceiveLengthInternal();
}
/**
* Set the timeout of {@link #transceive} in milliseconds.
* <p>The timeout only applies to MifareUltralight {@link #transceive},

8
core/java/android/nfc/tech/Ndef.java
View File

@@ -334,9 +334,11 @@ public final class Ndef extends BasicTagTechnology {
* @return true if it is possible to make this tag read-only
*/
public boolean canMakeReadOnly() {
if (mNdefType == TYPE_1 || mNdefType == TYPE_2) {
return true;
} else {
INfcTag tagService = mTag.getTagService();
try {
return tagService.canMakeReadOnly(mNdefType);
} catch (RemoteException e) {
Log.e(TAG, "NFC service dead", e);
return false;
}
}

11
core/java/android/nfc/tech/NfcA.java
View File

@@ -102,6 +102,9 @@ public final class NfcA extends BasicTagTechnology {
* for example a SENS_REQ is not possible (these are used to
* manage tag polling and initialization).
*
* <p>Use {@link #getMaxTransceiveLength} to retrieve the maximum number of bytes
* that can be sent with {@link #transceive}.
*
* <p>This is an I/O operation and will block until complete. It must
* not be called from the main application thread. A blocked call will be canceled with
* {@link IOException} if {@link #close} is called from another thread.
@@ -117,6 +120,14 @@ public final class NfcA extends BasicTagTechnology {
return transceive(data, true);
}
/**
* Return the maximum number of bytes that can be sent with {@link #transceive}.
* @return the maximum number of bytes that can be sent with {@link #transceive}.
*/
public int getMaxTransceiveLength() {
return getMaxTransceiveLengthInternal();
}
/**
* Set the timeout of {@link #transceive} in milliseconds.
* <p>The timeout only applies to NfcA {@link #transceive}, and is

11
core/java/android/nfc/tech/NfcB.java
View File

@@ -97,6 +97,9 @@ public final class NfcB extends BasicTagTechnology {
* <p>Applications must not send commands that manage the polling
* loop and initialization (SENSB_REQ, SLOT_MARKER etc).
*
* <p>Use {@link #getMaxTransceiveLength} to retrieve the maximum number of bytes
* that can be sent with {@link #transceive}.
*
* <p>This is an I/O operation and will block until complete. It must
* not be called from the main application thread. A blocked call will be canceled with
* {@link IOException} if {@link #close} is called from another thread.
@@ -111,4 +114,12 @@ public final class NfcB extends BasicTagTechnology {
public byte[] transceive(byte[] data) throws IOException {
return transceive(data, true);
}
/**
* Return the maximum number of bytes that can be sent with {@link #transceive}.
* @return the maximum number of bytes that can be sent with {@link #transceive}.
*/
public int getMaxTransceiveLength() {
return getMaxTransceiveLengthInternal();
}
}

11
core/java/android/nfc/tech/NfcF.java
View File

@@ -101,6 +101,9 @@ public final class NfcF extends BasicTagTechnology {
* <p>Applications must not append the SoD (length) or EoD (CRC) to the payload,
* it will be automatically calculated.
*
* <p>Use {@link #getMaxTransceiveLength} to retrieve the maximum amount of bytes
* that can be sent with {@link #transceive}.
*
* <p>This is an I/O operation and will block until complete. It must
* not be called from the main application thread. A blocked call will be canceled with
* {@link IOException} if {@link #close} is called from another thread.
@@ -116,6 +119,14 @@ public final class NfcF extends BasicTagTechnology {
return transceive(data, true);
}
/**
* Return the maximum number of bytes that can be sent with {@link #transceive}.
* @return the maximum number of bytes that can be sent with {@link #transceive}.
*/
public int getMaxTransceiveLength() {
return getMaxTransceiveLengthInternal();
}
/**
* Set the timeout of {@link #transceive} in milliseconds.
* <p>The timeout only applies to NfcF {@link #transceive}, and is

12
core/java/android/nfc/tech/NfcV.java
View File

@@ -97,6 +97,9 @@ public final class NfcV extends BasicTagTechnology {
* it will be automatically calculated. The application does
* provide FLAGS, CMD and PARAMETER bytes.
*
* <p>Use {@link #getMaxTransceiveLength} to retrieve the maximum amount of bytes
* that can be sent with {@link #transceive}.
*
* <p>This is an I/O operation and will block until complete. It must
* not be called from the main application thread. A blocked call will be canceled with
* {@link IOException} if {@link #close} is called from another thread.
@@ -111,4 +114,13 @@ public final class NfcV extends BasicTagTechnology {
public byte[] transceive(byte[] data) throws IOException {
return transceive(data, true);
}
/**
* Return the maximum number of bytes that can be sent with {@link #transceive}.
* @return the maximum number of bytes that can be sent with {@link #transceive}.
*/
public int getMaxTransceiveLength() {
return getMaxTransceiveLengthInternal();
}
}