Skip to content

Commit 46797ac

Browse files
author
Nick Pelly
committed
Fix docs type that broke build.
Change-Id: I5b5a2fc5baf95ace74bf90ff2c750ba890054d64
1 parent 74fe6c6 commit 46797ac

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

core/java/android/nfc/tech/MifareClassic.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ public int getSectorCount() {
250250
* Return the total number of MIFARE Classic blocks.
251251
* <p>Does not cause any RF activity and does not block.
252252
* @return total number of blocks
253+
*/
253254
public int getBlockCount() {
254255
return mSize / BLOCK_SIZE;
255256
}

core/java/android/nfc/tech/MifareUltralight.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,16 @@ public int getType() {
136136
* not be called from the main application thread. A blocked call will be canceled with
137137
* {@link IOException} if {@link #close} is called from another thread.
138138
*
139-
* @param pageIndex index of first page to read, starting from 0
139+
* @param pageOffset index of first page to read, starting from 0
140140
* @return 4 pages (16 bytes)
141141
* @throws TagLostException if the tag leaves the field
142142
* @throws IOException if there is an I/O failure, or the operation is canceled
143143
*/
144-
public byte[] readPages(int pageIndex) throws IOException {
145-
validatePageIndex(pageIndex);
144+
public byte[] readPages(int pageOffset) throws IOException {
145+
validatePageIndex(pageOffset);
146146
checkConnected();
147147

148-
byte[] cmd = { 0x30, (byte) pageIndex};
148+
byte[] cmd = { 0x30, (byte) pageOffset};
149149
return transceive(cmd, false);
150150
}
151151

@@ -159,18 +159,18 @@ public byte[] readPages(int pageIndex) throws IOException {
159159
* not be called from the main application thread. A blocked call will be canceled with
160160
* {@link IOException} if {@link #close} is called from another thread.
161161
*
162-
* @param pageIndex index of page to write, starting from 0
162+
* @param pageOffset index of page to write, starting from 0
163163
* @param data 4 bytes to write
164164
* @throws TagLostException if the tag leaves the field
165165
* @throws IOException if there is an I/O failure, or the operation is canceled
166166
*/
167-
public void writePage(int pageIndex, byte[] data) throws IOException {
168-
validatePageIndex(pageIndex);
167+
public void writePage(int pageOffset, byte[] data) throws IOException {
168+
validatePageIndex(pageOffset);
169169
checkConnected();
170170

171171
byte[] cmd = new byte[data.length + 2];
172172
cmd[0] = (byte) 0xA2;
173-
cmd[1] = (byte) pageIndex;
173+
cmd[1] = (byte) pageOffset;
174174
System.arraycopy(data, 0, cmd, 2, data.length);
175175

176176
transceive(cmd, false);

core/java/android/nfc/tech/NdefFormatable.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ public NdefFormatable(Tag tag) throws RemoteException {
8585
* not be called from the main application thread. A blocked call will be canceled with
8686
* {@link IOException} if {@link #close} is called from another thread.
8787
*
88-
* @param msg the NDEF message to write after formatting
88+
* @param firstMessage the NDEF message to write after formatting
8989
* @throws TagLostException if the tag leaves the field
9090
* @throws IOException if there is an I/O failure, or the operation is canceled
9191
* @throws FormatException if the NDEF Message to write is malformed
9292
*/
93-
public void format(NdefMessage msg) throws IOException, FormatException {
94-
format(msg, false);
93+
public void format(NdefMessage firstMessage) throws IOException, FormatException {
94+
format(firstMessage, false);
9595
}
9696

9797
/**
@@ -105,13 +105,13 @@ public void format(NdefMessage msg) throws IOException, FormatException {
105105
* not be called from the main application thread. A blocked call will be canceled with
106106
* {@link IOException} if {@link #close} is called from another thread.
107107
*
108-
* @param msg the NDEF message to write after formatting
108+
* @param firstMessage the NDEF message to write after formatting
109109
* @throws TagLostException if the tag leaves the field
110110
* @throws IOException if there is an I/O failure, or the operation is canceled
111111
* @throws FormatException if the NDEF Message to write is malformed
112112
*/
113-
public void formatReadOnly(NdefMessage msg) throws IOException, FormatException {
114-
format(msg, true);
113+
public void formatReadOnly(NdefMessage firstMessage) throws IOException, FormatException {
114+
format(firstMessage, true);
115115
}
116116

117117
/*package*/ void format(NdefMessage firstMessage, boolean makeReadOnly) throws IOException,

0 commit comments

Comments
 (0)