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

am 062443f2: am 40684946: Merge "Fix docs type that broke build." into gingerbread

Browse Source 
* commit '062443f2956bb85ef84485a62e9b0496fded68ae':
  Fix docs type that broke build.
This commit is contained in:
Nick Pelly
2011-02-03 16:35:12 -08:00
committed by Android Git Automerger
parent a9c369d0fb 062443f295
commit 7c95a2c247
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,6 +250,7 @@ public final class MifareClassic extends BasicTagTechnology {
* Return the total number of MIFARE Classic blocks.
* <p>Does not cause any RF activity and does not block.
* @return total number of blocks
*/
public int getBlockCount() {
return mSize / BLOCK_SIZE;
}

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

@@ -136,16 +136,16 @@ public final class MifareUltralight extends BasicTagTechnology {
* 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.
*
* @param pageIndex index of first page to read, starting from 0
* @param pageOffset index of first page to read, starting from 0
* @return 4 pages (16 bytes)
* @throws TagLostException if the tag leaves the field
* @throws IOException if there is an I/O failure, or the operation is canceled
*/
public byte[] readPages(int pageIndex) throws IOException {
validatePageIndex(pageIndex);
public byte[] readPages(int pageOffset) throws IOException {
validatePageIndex(pageOffset);
checkConnected();
byte[] cmd = { 0x30, (byte) pageIndex};
byte[] cmd = { 0x30, (byte) pageOffset};
return transceive(cmd, false);
}
@@ -159,18 +159,18 @@ public final class MifareUltralight extends BasicTagTechnology {
* 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.
*
* @param pageIndex index of page to write, starting from 0
* @param pageOffset index of page to write, starting from 0
* @param data 4 bytes to write
* @throws TagLostException if the tag leaves the field
* @throws IOException if there is an I/O failure, or the operation is canceled
*/
public void writePage(int pageIndex, byte[] data) throws IOException {
validatePageIndex(pageIndex);
public void writePage(int pageOffset, byte[] data) throws IOException {
validatePageIndex(pageOffset);
checkConnected();
byte[] cmd = new byte[data.length + 2];
cmd[0] = (byte) 0xA2;
cmd[1] = (byte) pageIndex;
cmd[1] = (byte) pageOffset;
System.arraycopy(data, 0, cmd, 2, data.length);
transceive(cmd, false);

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

@@ -85,13 +85,13 @@ public final class NdefFormatable extends BasicTagTechnology {
* 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.
*
* @param msg the NDEF message to write after formatting
* @param firstMessage the NDEF message to write after formatting
* @throws TagLostException if the tag leaves the field
* @throws IOException if there is an I/O failure, or the operation is canceled
* @throws FormatException if the NDEF Message to write is malformed
*/
public void format(NdefMessage msg) throws IOException, FormatException {
format(msg, false);
public void format(NdefMessage firstMessage) throws IOException, FormatException {
format(firstMessage, false);
}
/**
@@ -105,13 +105,13 @@ public final class NdefFormatable extends BasicTagTechnology {
* 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.
*
* @param msg the NDEF message to write after formatting
* @param firstMessage the NDEF message to write after formatting
* @throws TagLostException if the tag leaves the field
* @throws IOException if there is an I/O failure, or the operation is canceled
* @throws FormatException if the NDEF Message to write is malformed
*/
public void formatReadOnly(NdefMessage msg) throws IOException, FormatException {
format(msg, true);
public void formatReadOnly(NdefMessage firstMessage) throws IOException, FormatException {
format(firstMessage, true);
}
/*package*/ void format(NdefMessage firstMessage, boolean makeReadOnly) throws IOException,