am 39cf3a44: Document NFC permissions. (47dac545) · Commits · e / os / android_frameworks_base

core/java/android/nfc/NfcAdapter.java

+9 −2

core/java/android/nfc/tech/IsoDep.java

+9 −1

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

+22 −1

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

+9 −0

core/java/android/nfc/tech/Ndef.java

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -37,7 +37,6 @@ import android.util.Log;
	* <p>		* <p>
	* Use the helper {@link #getDefaultAdapter(Context)} to get the default NFC		* Use the helper {@link #getDefaultAdapter(Context)} to get the default NFC
	* adapter for this Android device.		* adapter for this Android device.
	* <p>
	*/		*/
	public final class NfcAdapter {		public final class NfcAdapter {
	private static final String TAG = "NFC";		private static final String TAG = "NFC";
	@@ -437,6 +436,8 @@ public final class NfcAdapter {
	* the completion of their {@link Activity#onPause} callback to disable foreground dispatch		* the completion of their {@link Activity#onPause} callback to disable foreground dispatch
	* after it has been enabled.		* after it has been enabled.
	*		*
			* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
			*
	* @param activity the Activity to dispatch to		* @param activity the Activity to dispatch to
	* @param intent the PendingIntent to start for the dispatch		* @param intent the PendingIntent to start for the dispatch
	* @param filters the IntentFilters to override dispatching for, or null to always dispatch		* @param filters the IntentFilters to override dispatching for, or null to always dispatch
	@@ -476,6 +477,8 @@ public final class NfcAdapter {
	*		*
	* <p>This method must be called from the main thread.		* <p>This method must be called from the main thread.
	*		*
			* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
			*
	* @param activity the Activity to disable dispatch to		* @param activity the Activity to disable dispatch to
	* @throws IllegalStateException if the Activity has already been paused		* @throws IllegalStateException if the Activity has already been paused
	*/		*/
	@@ -513,10 +516,12 @@ public final class NfcAdapter {
	*		*
	* <p>This method must be called from the main thread.		* <p>This method must be called from the main thread.
	*		*
	* <p><em>NOTE</em> While foreground NDEF push is active standard tag dispatch is disabled.		* <p class="note"><em>NOTE:</em> While foreground NDEF push is active standard tag dispatch is disabled.
	* Only the foreground activity may receive tag discovered dispatches via		* Only the foreground activity may receive tag discovered dispatches via
	* {@link #enableForegroundDispatch}.		* {@link #enableForegroundDispatch}.
	*		*
			* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
			*
	* @param activity the foreground Activity		* @param activity the foreground Activity
	* @param msg a NDEF Message to push over P2P		* @param msg a NDEF Message to push over P2P
	* @throws IllegalStateException if the Activity is not currently in the foreground		* @throws IllegalStateException if the Activity is not currently in the foreground
	@@ -548,6 +553,8 @@ public final class NfcAdapter {

Original line number	Original line	Diff line number	Diff line
	@@ -26,12 +26,15 @@ import java.io.IOException;
	/**		/**
	* Provides access to ISO-DEP (ISO 14443-4) properties and I/O operations on a {@link Tag}.		* Provides access to ISO-DEP (ISO 14443-4) properties and I/O operations on a {@link Tag}.
	*		*
	* <p>Acquire a {@link IsoDep} object using {@link #get}.		* <p>Acquire an {@link IsoDep} object using {@link #get}.
	* <p>The primary ISO-DEP I/O operation is {@link #transceive}. Applications must		* <p>The primary ISO-DEP I/O operation is {@link #transceive}. Applications must
	* implement their own protocol stack on top of {@link #transceive}.		* implement their own protocol stack on top of {@link #transceive}.
	* <p>Tags that enumerate the {@link IsoDep} technology in {@link Tag#getTechList}		* <p>Tags that enumerate the {@link IsoDep} technology in {@link Tag#getTechList}
	* will also enumerate		* will also enumerate
	* {@link NfcA} or {@link NfcB} (since IsoDep builds on top of either of these).		* {@link NfcA} or {@link NfcB} (since IsoDep builds on top of either of these).
			*
			* <p class="note"><strong>Note:</strong> Methods that perform I/O operations
			* require the {@link android.Manifest.permission#NFC} permission.
	*/		*/
	public final class IsoDep extends BasicTagTechnology {		public final class IsoDep extends BasicTagTechnology {
	private static final String TAG = "NFC";		private static final String TAG = "NFC";
	@@ -80,6 +83,9 @@ public final class IsoDep extends BasicTagTechnology {
	* <p>Setting a longer timeout may be useful when performing		* <p>Setting a longer timeout may be useful when performing
	* transactions that require a long processing time on the tag		* transactions that require a long processing time on the tag
	* such as key generation.		* such as key generation.
			*
			* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
			*
	* @param timeout timeout value in milliseconds		* @param timeout timeout value in milliseconds
	*/		*/
	public void setTimeout(int timeout) {		public void setTimeout(int timeout) {
	@@ -142,6 +148,8 @@ public final class IsoDep extends BasicTagTechnology {
	* not be called from the main application thread. A blocked call will be canceled with		* 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.		* {@link IOException} if {@link #close} is called from another thread.
	*		*
			* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
			*
	* @param data command bytes to send, must not be null		* @param data command bytes to send, must not be null
	* @return response bytes received, will not be null		* @return response bytes received, will not be null
	* @throws TagLostException if the tag leaves the field		* @throws TagLostException if the tag leaves the field

Original line number	Original line	Diff line number	Diff line
	@@ -55,7 +55,7 @@ import java.nio.ByteOrder;
	* MIFARE Classic cards that have been formatted according to the		* MIFARE Classic cards that have been formatted according to the
	* MIFARE Application Directory (MAD) specification.		* MIFARE Application Directory (MAD) specification.
	* <li>{@link #KEY_NFC_FORUM} is the well-known key for MIFARE Classic cards that		* <li>{@link #KEY_NFC_FORUM} is the well-known key for MIFARE Classic cards that
	* have been formatted according to the NFC		* have been formatted according to the NXP specification for NDEF on MIFARE Classic.
	*		*
	* <p>Implementation of this class on a Android NFC device is optional.		* <p>Implementation of this class on a Android NFC device is optional.
	* If it is not implemented, then		* If it is not implemented, then
	@@ -64,6 +64,9 @@ import java.nio.ByteOrder;
	* and {@link Ndef#MIFARE_CLASSIC} NDEF tags will also be supported. In either case,		* and {@link Ndef#MIFARE_CLASSIC} NDEF tags will also be supported. In either case,
	* {@link NfcA} will also be enumerated on the tag, because all MIFARE Classic tags are also		* {@link NfcA} will also be enumerated on the tag, because all MIFARE Classic tags are also
	* {@link NfcA}.		* {@link NfcA}.
			*
			* <p class="note"><strong>Note:</strong> Methods that perform I/O operations
			* require the {@link android.Manifest.permission#NFC} permission.
	*/		*/
	public final class MifareClassic extends BasicTagTechnology {		public final class MifareClassic extends BasicTagTechnology {
	/**		/**
	@@ -319,6 +322,8 @@ public final class MifareClassic extends BasicTagTechnology {
	* not be called from the main application thread. A blocked call will be canceled with		* 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.		* {@link IOException} if {@link #close} is called from another thread.
	*		*
			* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
			*
	* @param sectorIndex index of sector to authenticate, starting from 0		* @param sectorIndex index of sector to authenticate, starting from 0
	* @param key 6-byte authentication key		* @param key 6-byte authentication key
	* @return true on success, false on authentication failure		* @return true on success, false on authentication failure
	@@ -344,6 +349,8 @@ public final class MifareClassic extends BasicTagTechnology {
	* not be called from the main application thread. A blocked call will be canceled with		* 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.		* {@link IOException} if {@link #close} is called from another thread.
	*		*
			* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
			*
	* @param sectorIndex index of sector to authenticate, starting from 0		* @param sectorIndex index of sector to authenticate, starting from 0
	* @param key 6-byte authentication key		* @param key 6-byte authentication key
	* @return true on success, false on authentication failure		* @return true on success, false on authentication failure
	@@ -398,6 +405,8 @@ public final class MifareClassic extends BasicTagTechnology {
	* not be called from the main application thread. A blocked call will be canceled with		* 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.		* {@link IOException} if {@link #close} is called from another thread.
	*		*

Original line number	Original line	Diff line number	Diff line
	@@ -51,6 +51,9 @@ import java.io.IOException;
	* If it is enumerated, then all {@link MifareUltralight} I/O operations will be supported.		* If it is enumerated, then all {@link MifareUltralight} I/O operations will be supported.
	* In either case, {@link NfcA} will also be enumerated on the tag,		* In either case, {@link NfcA} will also be enumerated on the tag,
	* because all MIFARE Ultralight tags are also {@link NfcA} tags.		* because all MIFARE Ultralight tags are also {@link NfcA} tags.
			*
			* <p class="note"><strong>Note:</strong> Methods that perform I/O operations
			* require the {@link android.Manifest.permission#NFC} permission.
	*/		*/
	public final class MifareUltralight extends BasicTagTechnology {		public final class MifareUltralight extends BasicTagTechnology {
	/** A MIFARE Ultralight compatible tag of unknown type */		/** A MIFARE Ultralight compatible tag of unknown type */
	@@ -136,6 +139,8 @@ public final class MifareUltralight extends BasicTagTechnology {
	* not be called from the main application thread. A blocked call will be canceled with		* 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.		* {@link IOException} if {@link #close} is called from another thread.
	*		*
			* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
			*
	* @param pageOffset 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)		* @return 4 pages (16 bytes)
	* @throws TagLostException if the tag leaves the field		* @throws TagLostException if the tag leaves the field
	@@ -159,6 +164,8 @@ public final class MifareUltralight extends BasicTagTechnology {
	* not be called from the main application thread. A blocked call will be canceled with		* 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.		* {@link IOException} if {@link #close} is called from another thread.
	*		*
			* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
			*
	* @param pageOffset index of page to write, starting from 0		* @param pageOffset index of page to write, starting from 0
	* @param data 4 bytes to write		* @param data 4 bytes to write
	* @throws TagLostException if the tag leaves the field		* @throws TagLostException if the tag leaves the field
	@@ -187,6 +194,8 @@ public final class MifareUltralight extends BasicTagTechnology {
	* not be called from the main application thread. A blocked call will be canceled with		* 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.		* {@link IOException} if {@link #close} is called from another thread.
	*		*
			* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
			*
	* @see NfcA#transceive		* @see NfcA#transceive
	*/		*/
	public byte[] transceive(byte[] data) throws IOException {		public byte[] transceive(byte[] data) throws IOException {