| 682c24e22811d4ee17ae1cd61bf255c3f7e722b7 |
12-Apr-2016 |
Trevor Johns <trevorjohns@google.com> |
Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
fcBarcode.java
|
| 6711e0203305ff7de001cc5ce557f878bf95a938 |
05-Feb-2016 |
Martijn Coenen <maco@google.com> |
Improve NFC-F transceive() docs.
It wrongly said the SoD included the length;
put a sample frame in the docs to help devs.
Change-Id: I8ea74f37e7335f3e05f7df81fc303bf6195ac3cc
fcF.java
|
| 65e37ee936e2406e58719584ce30b6aa21792ce0 |
19-Mar-2014 |
Paul Quei <paulquei@gmail.com> |
fix issuse 65774
"Some vendors have there own well defined specifications ...". Should be "Some vendors have their own well defined specifications ..."
Change-Id: I0d770ac0591812c1c61389eb0078493098784323
Signed-off-by: Paul Quei <paulquei@gmail.com>
def.java
|
| ae2a35baf41290df626a17ba12cf1df6cb006a16 |
06-Mar-2014 |
Martijn Coenen <maco@google.com> |
am 4d328a79: am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field."
* commit '4d328a79bdee417c1248660b1c33b5cd86dbd814':
NFC: getNdefMessage() should throw exception if no tag in field.
|
| 266e0a387123773538d7768a63d37793500169a1 |
02-Nov-2012 |
Mathias Jeppsson <mathias.jeppsson@sonymobile.com> |
NFC: getNdefMessage() should throw exception if no tag in field.
According to documentation, an TagLostException should be thrown, if
the tag has been moved out of field when reading NDEF message.
Change-Id: Ib7e485ed442027fdebd5bc7a46101fbca0c88bdb
def.java
|
| 6090995951c6e2e4dcf38102f01793f8a94166e1 |
19-Nov-2013 |
John Spurlock <jspurlock@google.com> |
Remove unused imports from frameworks/base.
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
def.java
defFormatable.java
|
| 35bf6288527b177a04100585321a1266f020004a |
14-Oct-2013 |
Martijn Coenen <maco@google.com> |
NFC card emulation API docs.
Bug: 10550319
Change-Id: I3023639d728aa76af89d15e0491b86c7c641648e
fcBarcode.java
|
| 7a6dfb2f7294bbfb5ebc4f937db97b659a447607 |
11-Dec-2012 |
Martijn Coenen <maco@google.com> |
Update NfcBarcode documentation for Kovio.
Change-Id: I4b6a452805c3dd68247dbe5493db14a263729615
fcBarcode.java
agTechnology.java
|
| ca0cf4ee782e474961e6de74f6004781773f957c |
25-Sep-2012 |
Martijn Coenen <maco@google.com> |
Fix build.
Bug: 7222958
Change-Id: I2f9ff988f09be6cd4be49bfb90750a46e63c2c14
fcBarcode.java
|
| 0bec15ebed8b8639076cba184af3235e17f48718 |
24-Sep-2012 |
Martijn Coenen <maco@google.com> |
Add NfcBarcode technology API.
Supporting only Kovio barcode technology for now.
Bug: 7222958
Change-Id: I63976da2db16b0a5d9ec746f1a0e83833e74e5a9
def.java
fcBarcode.java
agTechnology.java
|
| d9966c4c21c9d3a49454b1267e43907e0256a414 |
05-Apr-2012 |
Martijn Coenen <maco@google.com> |
Merge "Patch to support MIFARE with SAK 0x01"
|
| fa98cf0573b813c8b1a880496d847d0d7183d05d |
03-Apr-2012 |
Martijn Coenen <maco@google.com> |
Add API for querying extended length APDU support.
Bug: 5813943
Change-Id: Iffb415f318e095bde9ed6677b22613d210f8a39c
soDep.java
|
| 72677c98bd8231374ff60a2dd48886446de99f1f |
24-Nov-2011 |
Sunil Jogi <sunil.jogi@nxp.com> |
Patch to support MIFARE with SAK 0x01
Change-Id: Ic30c083bb43b37f90beefc0ff165ba2713635a7f
ifareClassic.java
|
| 6c65344fcf5aa1499dafe1cad1d1ba5c66293776 |
30-Mar-2012 |
Martijn Coenen <maco@google.com> |
Fix permission documentation.
It was incorrect in one case. Also removed obsolete
interface method.
Change-Id: I211fb57e3504e06ff09cf31857c89e2b0e93d679
def.java
|
| a032783241cbbed47ed05df32c56298ee0f9902b |
29-Mar-2012 |
Martijn Coenen <maco@google.com> |
Fix NDEF documentation to indicate the message may be null.
The current NFC stack formats tags to the INITIALIZED state
as defined by NFC forum; in that state the tag has the
NDEF Capability Container, but does not contain any message
yet.
Tags in that state (correctly) return the NDEF technology,
but the documentation does not specify that the message
may be null.
Also, get rid of buggy getLastErrorCode and use
(cached) presence check value to determine if tag was
lost during read.
Change-Id: If4293428093024ba9cda5dd7c9979b8b06353234
def.java
|
| 2976da0305367ac051d0fcae160bfdb0497b2750 |
29-Mar-2012 |
Martijn Coenen <maco@google.com> |
Allow formatting a tag as NDEF without a message.
Change-Id: I53a219eec17450b2d0ddc42556f0b930d9b34615
defFormatable.java
|
| 1f5badc1cb08f10ddf4b09aaaf34060a23999a51 |
24-Jan-2012 |
Nick Pelly <npelly@google.com> |
Add NdefMessage.getByteLength(), and more minor fixes:
Remove NdefMessage from dispatch(). It's already in the Tag.
/*package*/ cleanup
Fix sitemap after removal of NFCDemo
Change-Id: Ie1f6d9ea98144aa97f56bb709a33f5d0ef916e8b
asicTagTechnology.java
|
| 23fc93a7c1e340e79642d3d0bf4b4658c8645c8e |
28-Nov-2011 |
Martijn Coenen <maco@google.com> |
Fix NPE on mock NDEF tech operations.
Change-Id: Ib67bd03b6275fdb86a5d6dedc6c7e4fed07ef8b0
def.java
|
| 82328bfd40008d85917cc01a1b2eb8eed1f23ec4 |
30-Aug-2011 |
Nick Pelly <npelly@google.com> |
NFC API updates.
o NfcAdapter.set*(): enforce at least one activity is provided at compile time.
o Unhide and update javadoc for some API's scheduled for ICS release.
Change-Id: I2bf4ea101442dcdeb359be26d3869f82e6e3748b
soDep.java
ifareClassic.java
ifareUltralight.java
fcA.java
fcF.java
|
| faca12adc62d148505fadfd286e6a2752c197fa0 |
19-Aug-2011 |
Martijn Coenen <maco@google.com> |
Add getMaxTransceiveLength() API.
Also moved canMakeReadOnly() down in the stack, and
cleaned up TransceiveResult.
Change-Id: I85576c52478ab79f0726606659b0c17d00b222e6
asicTagTechnology.java
soDep.java
ifareClassic.java
ifareUltralight.java
def.java
fcA.java
fcB.java
fcF.java
fcV.java
|
| 20e62c9f1466ace5771e244f03a995dc0939b11b |
20-Jul-2011 |
Martijn Coenen <maco@google.com> |
Support for getTimeout() (API).
Bug: 4492175
Change-Id: Ibc9a1b78d8c0992f47664d33760e0ce8dca67c64
soDep.java
ifareClassic.java
ifareUltralight.java
fcA.java
fcF.java
|
| 112fdf612db71a552fce063136bf2796df3b71ec |
09-Jun-2011 |
Martijn Coenen <maco@google.com> |
Support for setting the NfcA transceive timeout (API).
Change-Id: I2c40fbc7e9101462afae18125feba30cf76ea5f2
soDep.java
ifareClassic.java
ifareUltralight.java
fcA.java
fcF.java
|
| a924973f22aedc580708625e4babb6deabc6b4d3 |
06-Jun-2011 |
Martijn Coenen <maco@google.com> |
Implement Felica timeout handling (API).
Allows controlling the timeout for transceive on Felica.
Change-Id: I5c62b3ea0e8a16bc006feac6ec759cdb730bc938
asicTagTechnology.java
soDep.java
fcF.java
|
| ea51a4275ab7353d537ff94d97e6294e49b50cab |
06-Jun-2011 |
Martijn Coenen <maco@google.com> |
Connecting to a NFC technology may fail.
NotSupportedOperationException will be thrown in these cases,
unchecked for now.
Bug: 4195403
Change-Id: I48f4f277d43afba8bc505ae2a6c216cc387b1e97
asicTagTechnology.java
|
| e00ef0087308e9f3522140b81b48f00e7cdc81c1 |
01-Jun-2011 |
Jeff Hamilton <jham@android.com> |
am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
* commit '7c324a3f7dde4be26b7a996b485a92ba25de3251':
Swap Mifare for MIFARE.
|
| fe6dfd504bfa31d95382d80cc7acc5b1add01b34 |
28-May-2011 |
Martijn Coenen <maco@google.com> |
Implement Mifare Ultralight-C detection (API).
Bug: 3398465
Change-Id: Ieb60deedfde5af4494a14b3e322c5a61ae75aaf9
ifareUltralight.java
|
| 734e9b0c73483fdaa582c21dedc24107b1fe8838 |
26-May-2011 |
Jeff Hamilton <jham@android.com> |
Swap Mifare for MIFARE.
Change-Id: I45580d32f5ccebf906372c3c1664bc66718a672e
ifareClassic.java
ifareUltralight.java
|
| 5644d0e18ad847b66a8cb4f185cb28edebe75d88 |
25-Feb-2011 |
Jeff Hamilton <jham@android.com> |
Support for NDEF on iCODE.
Change-Id: I9ce2ee5e739d34a9047ca494315cbc54b30fefb8
def.java
|
| 2deeefeb5e6342c44e8fceb4104f1ad96b9bc704 |
15-Feb-2011 |
Robert Ly <robertly@google.com> |
Adding package summary for nfc.tech package
Change-Id: Ibbf55c21dcaf48b4eb369e78c54fb1023abb3cb3
ackage.html
|
| 58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9 |
09-Feb-2011 |
Jeff Hamilton <jham@android.com> |
Merge "More documentation updates for NFC." into gingerbread
|
| 28319c0cec94977682db32b949628a8e4b8183dc |
09-Feb-2011 |
Jeff Hamilton <jham@android.com> |
More documentation updates for NFC.
Change-Id: Ie134d4296ee12333e6647ce76126f9767ba1ba34
def.java
|
| 39cf3a445e507f219ecc8a476f6038f095d9d520 |
07-Feb-2011 |
Nick Pelly <npelly@google.com> |
Document NFC permissions.
Change-Id: Ib1b1625058c9c673692f3fbcb3546ec7c2d54a07
soDep.java
ifareClassic.java
ifareUltralight.java
def.java
defFormatable.java
fcA.java
fcB.java
fcF.java
fcV.java
agTechnology.java
|
| 46797ac098e90cbef5c266b75fb37fc06e9acc80 |
04-Feb-2011 |
Nick Pelly <npelly@google.com> |
Fix docs type that broke build.
Change-Id: I5b5a2fc5baf95ace74bf90ff2c750ba890054d64
ifareClassic.java
ifareUltralight.java
defFormatable.java
|
| 74fe6c6b245ebe7d3b3d96962c32980d88dca4f5 |
03-Feb-2011 |
Nick Pelly <npelly@google.com> |
NFC documentation overhaul.
Change-Id: I45dca95a24b2d0327e080436fbcc7b1dad79de02
soDep.java
ifareClassic.java
ifareUltralight.java
def.java
defFormatable.java
fcA.java
fcB.java
fcF.java
fcV.java
agTechnology.java
|
| f003e26df96067b4b136f0859012cb7ec3ed930f |
01-Feb-2011 |
Nick Pelly <npelly@google.com> |
Final final final Gingerbread MR API changes.
This is it. I promise.
ACTION_TECHNOLOGY_DISCOVERED -> ACTION_TECH_DISCOVERED
This was missed in our technology->tech rename.
Hide TagTechnology.reconnect()
This is used to reset any per-connection state in a tag, by reconnecting
to it. The first problem is that it belongs on Tag, not TagTechnology. The
second problem is that it may become redundant once we add Tag.rediscover()
which will also reconnect to the tag, and will also return a new Tag with
newly created technologies enumerated. And the third and most significant
problem is that you can already achieve the same result by just calling
close() followed by connect().
Hide Tag.createMockTag()
This API cannot be used reliably. First it requires using int[] for the
technology list, but those int constants are now hidden. Second it requires
knowledge of the extras parcel used to fill technology specific data - also
not public.
Introduce TagTechnology.isConnected()
Every child class already impelmented this, and given that connect() and
close() are defined on the interface, then isConnected() should be there
too.
Modify Ndef.getType to return a string (not int)
Allows more flexibility in adding new NDEF types. Current public strings are
org.nfcforum.ndef.type1
org.nfcforum.ndef.type2
org.nfcforum.ndef.type3
org.nfcforum.ndef.type4
com.nxp.ndef.mifareclassic
Add NdefFormatable.formatReadOnly()
This allows you to make the tag read-only at the same time as performing
format and write. It is important because we currently don't have any
public API to re-enumerate a tag technology list after making a tag
NDEF compatible, so you can't perform the format as a seperate step
without physically removing the tag from field and returning it.
Modify Readonly -> ReadOnly
Make Tag class final
Change-Id: Icf306aeb37b936ca3007e4868e99b6baceac4aff
asicTagTechnology.java
def.java
defFormatable.java
agTechnology.java
|
| 3fcedf77286a078ebd7ac8c082365bd80703dfdc |
27-Jan-2011 |
Nick Pelly <npelly@google.com> |
API: Make close() throw an IOException.
IOException on close() can be useful to indicate that in-progress transactions
were canceled.
I also audited all of our tech classes to make sure every function that needs
to throw IOException does so.
Change-Id: Iaa9c43d79d59ff85772d5c3e4b4d57a6fa8df4cf
asicTagTechnology.java
soDep.java
agTechnology.java
|
| 21d0a173f138563e2eaba286b0eb505f987918a9 |
27-Jan-2011 |
Nick Pelly <npelly@google.com> |
Fix build - javadoc.
Change-Id: I0168fb4a75f4dff88e347c0dfd1f0b39e2dba0d6
ifareUltralight.java
|
| 4a5e2532205252e0b8616ebc07ca089fd3721681 |
27-Jan-2011 |
Nick Pelly <npelly@google.com> |
Clean up MifareUltralight API.
o Some javadoc updates
o writeBlock -> writePages (Block means something else in NFC Forum).
o validate page offset
Change-Id: Icae54db3397d57aaa451caaa86d56e8ba82507f2
ifareClassic.java
ifareUltralight.java
|
| f126ad3b6484ef62eed202f1f49cc4557c0a3848 |
25-Jan-2011 |
Jeff Hamilton <jham@android.com> |
Merge "Use classnames instead of ints for NFC techs." into gingerbread
|
| d88e9aa575eb3a9d20cdb0e8918d54993e1ce1e0 |
24-Jan-2011 |
Jeff Hamilton <jham@android.com> |
Use classnames instead of ints for NFC techs.
This makes the system more flexible and allows
adding new technology types without having to
update the API.
Change-Id: Iaee6b633965e501a70e8afc3f1d54d9d94a4d05a
asicTagTechnology.java
def.java
agTechnology.java
|
| b134223f91c8801d577cb72e92a37cb65fec717a |
25-Jan-2011 |
Nick Pelly <npelly@google.com> |
Make Mifare Classic increment/decrement operands little endian
Also make sure they are non-negative.
This is not documented in Mifare Classic spec, but based on findings from NXP:
- Operand should be stored in little-endian format in the transceive buffer
- Tag ignores the sign bit on the operand, its effectively 31-bit unsigned
- Overflow and underflow generates an error.
Change-Id: Id3389b3894ded732c4b00d564ca53f5df651359e
ifareClassic.java
|
| 1e233af3a783d44843a6f2b895d00a5d3b0c29f0 |
24-Jan-2011 |
Nick Pelly <npelly@google.com> |
Add operands to mifare classic increment, decrement.
Change-Id: Ib35f615142bda48a5e33888a09ebae2880624788
ifareClassic.java
|
| e45083b11bef915f713379fb4106dd2ebd897d03 |
22-Jan-2011 |
Nick Pelly <npelly@google.com> |
Make MifareClassic methods more consistent.
Remove method overloading for combinations of sector+block addressing.
Instead provide methods that more closly match the raw commands, and more
efficient helpers to convert between blocks and sectors.
o fix off-by-one bug in getBlockCountInSector()
o add BLOCK_SIZE
o remove DESFIRE not operating in classic emulation (SAK 0x20)
o hide isEmulated(), there is no use case, and the info is available elsewhere
o getTotalBlockCount() -> getBlockCount()
o getBlockCount(int) -> getBlockCountInSector(int)
o introduce blockToSector() and sectorToBlock()
o remove authenticateBlock()
make it really clear that authentication is per sector, and reduce function
explosion. blockToSector() allows you to use authenticateSector...
o explicit authenticateSectorWithKeyA() / authenticateSectorWithKeyB()
get rid of magic boolean
o remove all (int sector, int block) parameters
always address by absolute block. this makes the API crystal clear, and
helps reduce function explosion
o validation of all sector and block indices
o dont & 0xff when converting to byte - its redundant
o Remove TYPE_OTHER. Mifare Classic types are well-known and stable.
Change-Id: I3c9f8254ff307f31b388b3d7592c862d5de6afa5
ifareClassic.java
|
| 4e21e1d21a877cce4db5ec8c5786604cc10f2d7e |
21-Jan-2011 |
Jeff Hamilton <jham@android.com> |
API changes for NFC.
Bug: 3366009
Change-Id: Ia28e03e1501421906b640b78d4c9a59a20e9c668
asicTagTechnology.java
soDep.java
ifareClassic.java
ifareUltralight.java
def.java
defFormatable.java
fcA.java
fcB.java
fcF.java
fcV.java
agTechnology.java
|