| 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
/frameworks/base/core/java/android/nfc/cardemulation/HostApduService.java
|
| a1ec95882901ebf386cc794122b36b18ee845554 |
|
07-Sep-2015 |
Martijn Coenen <maco@google.com> |
Fix missing copyright headers.
Bug: 23868522
Change-Id: I37fb86e3a751fad363d70687d1b9bcd512bcd33e
/frameworks/base/core/java/android/nfc/cardemulation/HostApduService.java
|
| 35bf6288527b177a04100585321a1266f020004a |
|
14-Oct-2013 |
Martijn Coenen <maco@google.com> |
NFC card emulation API docs.
Bug: 10550319
Change-Id: I3023639d728aa76af89d15e0491b86c7c641648e
/frameworks/base/core/java/android/nfc/cardemulation/HostApduService.java
|
| 51b6322197da054715e53d02754bc81caa8fd456 |
|
04-Sep-2013 |
Martijn Coenen <maco@google.com> |
Remove legacy HCE APIs.
Bug: 10550349
Change-Id: Ie60942f9551e93bcfb597f7f2a5b9cc9bf21a11a
/frameworks/base/core/java/android/nfc/cardemulation/HostApduService.java
|
| c85fb576b817aae2d853b6f5cb6effb924b892ed |
|
03-Sep-2013 |
Martijn Coenen <maco@google.com> |
Add drawable for Apdu Services, fix build.
Change-Id: I7c138adb60b2efe19377b58b35360cd234628424
/frameworks/base/core/java/android/nfc/cardemulation/HostApduService.java
|
| fb2f8337f6fca9809156ddbaf0a7fe468bc1329f |
|
03-Sep-2013 |
Martijn Coenen <maco@google.com> |
NFC: @hide and remove abstract from processCommandApdu().
Replaced by new version with Bundle extras.
Bug: 10550349
Change-Id: If5f284c6d9b14ab32670ebc84881f459813b5b56
/frameworks/base/core/java/android/nfc/cardemulation/HostApduService.java
|
| 52246087f4e2b5ad62b9cd6ea8c2cb58f624d4e7 |
|
30-Aug-2013 |
Martijn Coenen <maco@google.com> |
HCE API review.
Keeping some of the old stuff @hide until all
clients have upgraded.
Bug: 10550349
Change-Id: Id5de7ab74c9b38c179fd20bd4746d95b7df8f033
/frameworks/base/core/java/android/nfc/cardemulation/HostApduService.java
|
| c3f0044abe657d3e6d9cd1f322b419abddeba20c |
|
29-Aug-2013 |
Martijn Coenen <maco@google.com> |
Add an API for querying HCE service selection mode.
This allows applications to differentiate between
the case where another app is the default, or the
case where the selection mode is "Ask every time".
Also, parse new requireDeviceUnlock attribute in
ApduServiceInfo.
Bug: 10262585
Change-Id: Icac508fe00054132574731532c05a1138edb24f5
/frameworks/base/core/java/android/nfc/cardemulation/HostApduService.java
|
| 583fe9d22b21aa77fad3096bfdad3020d6088230 |
|
15-Aug-2013 |
Martijn Coenen <maco@google.com> |
NFC: Allow HostApduService to indicate transaction unhandled.
This will cause the OS to show UI that allows the user to pick
another application that could potentially handle the transaction.
Also, tweak processCommandApdu() method to take a Bundle to be more
future-proof.
Bug: 10262585
Change-Id: If9d060341b472fac0349f539c04b87e85fe79dfb
/frameworks/base/core/java/android/nfc/cardemulation/HostApduService.java
|
| a7397883de67d674970d91f86d46ccf637e5e543 |
|
31-Jul-2013 |
Martijn Coenen <maco@google.com> |
NFC: Host-based card emulation APIs.
- New INfcCardEmulation interface to allow apps to interface
with card emulation system.
- New BIND_NFC_SERVICE permission to prevent malicious apps
from binding to card emulation services.
- ApduServiceInfo is now in the framework.
- Added constants to Settings.Secure for storing defaults.
- Modified XML grammar a bit.
Change-Id: I56b3fa6b42eb5dc132c91c1386ab1e6bac779059
/frameworks/base/core/java/android/nfc/cardemulation/HostApduService.java
|
| c3178e5f1c346ad5faa926a6765147840116f4a7 |
|
26-Jul-2013 |
Martijn Coenen <maco@google.com> |
Change XML-grammar for (Off)HostApduServices.
AIDs can now carry a category attribute. Clarified that
"OffHostApduService" is not bound to by Android, and may
be extended by offering service interfaces that are not
defined in the platform.
Change-Id: Idd0a3990beb927e8d81366013f53386fb46e3f9f
/frameworks/base/core/java/android/nfc/cardemulation/HostApduService.java
|
| 5eaa8970aa86fa32a6cbb47e0681000ed2d22c57 |
|
18-Jul-2013 |
Martijn Coenen <maco@google.com> |
First shot at (host-based) card emulation APIs.
HostApduService: convenience service class for implementing
a service that registers a set of ISO7816-4 AIDs and emulates
the corresponding application inside the service itself.
SeApduService: convenience service class for implementing
a service that registers a set of ISO7816-4 AIDs that reflect
applications installed on an embedded secure element or UICC. Contains
event hooks to allow the service to handle eSE/UICC events that
correspond to those AIDs.
Change-Id: I44191bd4abcbbe4f1fd36a9fd42639fe5c0cf496
/frameworks/base/core/java/android/nfc/cardemulation/HostApduService.java
|