| 31b0f4653686119d74876cae5d637c5baf52b935 |
12-Nov-2014 |
Andres Morales <anmorales@google.com> |
Prevent Beam at the lockscreen and during provisioning
Since we can poll at the lockscreen not for unlock
tags, need to explicitly disable Beam.
Also since we allow peripheral handover during provisioning,
we started allowing Beam as well. Blocking that.
Bug: 18349433
Change-Id: I987f43228d2c003c66201d2e91bd9bdfebd49d78
fc/dhimpl/NativeNfcManager.java
|
| c19c065b6d0e1a088780c4dca27a1404d5926765 |
09-Sep-2014 |
Martijn Coenen <maco@google.com> |
Reinstate RF field events.
These are generic enough to maintain in AOSP,
and can still be protected by nfcee_access.xml
like they used to be.
Bug: 16653617
Change-Id: Id604fcc45d4263b24fea2f16ca6a24e25f8580c3
fc/dhimpl/NativeNfcManager.java
|
| 1639c10dcfa150cf1c2bac171b8b710f103af766 |
12-Aug-2014 |
Martijn Coenen <maco@google.com> |
Fix deadlock.
Bug: 16958324
Change-Id: I0cc7b4b9d400727cc6e59ad7d5440dfb2842edbe
fc/dhimpl/NativeNfcTag.java
|
| f5c979220fadb2c3ac0bca09e16d0d281ed20eb2 |
25-Jul-2014 |
Martijn Coenen <maco@google.com> |
Support for configuring SE listen technologies.
If the config file specified an SE to use, configure
its listen technologies correctly.
Also, fix commitRouting() to actually commit the
configuration.
Bug: 16517161
Change-Id: I1283fcb3f855c89a8b238be857bd56f06a14138f
fc/dhimpl/NativeNfcManager.java
|
| 304a6342ee7e5620d3b50d988755c035f1686dc2 |
28-Jun-2014 |
Martijn Coenen <maco@google.com> |
Don't conditionally enable snooze.
We keep our devices in snooze by default now.
Change-Id: Ia84635031d60221da054448b8c81c5c48f1f821d
fc/dhimpl/NativeNfcManager.java
|
| 0799bcbe2469aa6a88c6cbdf0cdee5b50e1994f0 |
18-Dec-2013 |
Andres Morales <anmorales@google.com> |
Refactoring NfcService routing logic.
Currently, routing logic contains a lot of nested conditionals
and causes unnecessary work to occur, particularly in enabling
reader mode. This CL moves this logic to a state object that contains
all necessary information to transfer from one routing state to another,
leading to fewer calls to the NFCC, eliminating duplicate work, and
making the code more readable.
Change-Id: I6a8758e61cc0cbb015d618575da35386eadf7d3a
fc/dhimpl/NativeNfcManager.java
|
| a30388eb7ddeabe1c9b85d49a65b82aac6a845ca |
12-Apr-2014 |
Andres Morales <anmorales@google.com> |
Fix duplicate tag dispatch after NFC triggered unlock
Since we allowed the tag to continue dispatch after unlock
as well as reenable discovery when the phone is unlocked
the tag used for unlock gets processed twice.
This patch adds logic to ensure the tag gets processed only
once.
Change-Id: Ie42bffb5ec302b68013e6bf1c1104db01e96e79f
fc/dhimpl/NativeNfcTag.java
|
| c8768e4b2ab114d227bd8af441d81525837f78cb |
25-Mar-2014 |
Martijn Coenen <maco@google.com> |
Goodbye secure element.
I really liked you,
but everybody else wanted you too.
Maybe some day you'll be back,
connected to the host CPU.
Change-Id: If78bce7c7178a77919b8b1b64334909f4ff7e037
fc/dhimpl/NativeNfcManager.java
fc/dhimpl/NativeNfcSecureElement.java
|
| a1e95d30dbe8dad0a8bb333b4ca17c009fc34e2f |
04-Feb-2014 |
Andres Morales <anmorales@google.com> |
Revert "Refactoring NfcService routing logic."
This reverts commit 80e61a46c0541471ef01a9d3c91570139336bcff.
Change-Id: I0b4fc471a3dae22c4d732b1c002f51a412c2c121
fc/dhimpl/NativeNfcManager.java
|
| 80e61a46c0541471ef01a9d3c91570139336bcff |
18-Dec-2013 |
Andres Morales <anmorales@google.com> |
Refactoring NfcService routing logic.
Currently, routing logic contains a lot of nested conditionals
and causes unnecessary work to occur, particularly in enabling
reader mode. This CL moves this logic to a state object that contains
all necessary information to transfer from one routing state to another,
leading to fewer calls to the NFCC, eliminating duplicate work, and
making the code more readable.
Change-Id: I4c451cb96ed27954fe2e6e7e7704643f3f3456a6
fc/dhimpl/NativeNfcManager.java
|
| fb18ffb259fe8f40e81516842497735a7c0b6a8c |
18-Dec-2013 |
Andres Morales <anmorales@google.com> |
nfc-64 part 1: store native structure in a long rather than an int
Change-Id: I3ff21d3f1ad0f8e9e643c84fecd4c45a1b373133
fc/dhimpl/NativeNfcManager.java
|
| d2604c0544f7bc26e5b2407f0215cccfffedae2c |
11-Dec-2013 |
Andres Morales <anmorales@google.com> |
Expose snooze mode config and polling modes in java layer
Change-Id: I3a604fb4260a1e99e6aa40189e999996d5947ed4
fc/dhimpl/NativeNfcManager.java
|
| 3dd24ecefb71ce4f585faa002ba1054a0c6dbd06 |
04-Sep-2013 |
Martijn Coenen <maco@google.com> |
Implement reader mode API for NXP chipsets.
Bug: 10360259
Change-Id: I1339840ed900b73d3f9ae43e1a01b59c7e679f9e
fc/dhimpl/NativeNfcManager.java
fc/dhimpl/NativeNfcTag.java
|
| 31f39aee25964dad1038b7a9cc335d5a386113c8 |
03-Sep-2013 |
Martijn Coenen <maco@google.com> |
Changes for callback model of reader mode APIs.
Bug: 10360259
Change-Id: I41c47ce84aa18bce01f6fb1ebe280fac0ed79070
fc/dhimpl/NativeNfcTag.java
|
| c4e4277a71c70e96198cb760676ad3b40f9e0e3d |
27-Aug-2013 |
Martijn Coenen <maco@google.com> |
Implement reader mode APIs.
Disable p2p/listen modes on request. Currently only
for NCI platforms, NXP will follow later.
Also, fixed some compiler warnings and a mem leak.
Bug: 10360259
Change-Id: Id13db24914adc43db62e055b66e0989e9cde2482
fc/dhimpl/NativeNfcManager.java
|
| 9f8f6cf9c58405ecafe2d425801e6c14088db8c7 |
30-Apr-2013 |
Martijn Coenen <maco@google.com> |
Host-based card emulation.
Initial check-in that allows to build basic HCE apps:
- Introduced new RoutingManager, taking care of programming
the routing table to the NFCC.
- Added DeviceHost interfaces for adding/removing aids to
the routing table, and sending raw frames.
- On devices that have an eSE, the eSE is the default route.
- Removed routing code from SecureElement class.
- HostEmulationManager resolves and dispatches AIDs
routed to the host to an application service.
- Simple Messenger service interface for exchanging APDUs.
- RegisteredAidCache keeps a cache of AIDs that are registered
by Android applications, as well as their route.
TODO:
- Dynamic registration of AIDs.
- Dynamic updates of the routing table.
- AID conflict resolution.
- Allow apps to indicate AIDs present "off-host".
- Implement base-class HCE service in framework.
- Switch default route to host.
Change-Id: I7d7643770fcc848699810ec5443d0d9b81d85669
fc/dhimpl/NativeNfcManager.java
|
| 525c260303268a83da4c3413b953d13c9084e834 |
14-Dec-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01
Change-Id: I3ccb25bf7cde2c22f52260cae0e9957517e6bb5f
fc/dhimpl/NativeNfcManager.java
fc/dhimpl/NativeNfcTag.java
|
| 4bbd47e5507d4c47a4d722216606307e45195a0a |
25-Jul-2012 |
Martijn Coenen <maco@google.com> |
Move NXP JNI and DeviceHost implementation into separate dir.
Preparation for the new NCI stack. The idea is to
build either the NXP or the NCI stack, triggered
by a makefile switch. To that end, move the
DeviceHost and JNI implementations in their own
directory, so we can build them only if needed.
Change-Id: I8579ec30ceb1908e4cd180cfbd10224aa4bddb8d
fc/dhimpl/NativeLlcpConnectionlessSocket.java
fc/dhimpl/NativeLlcpServiceSocket.java
fc/dhimpl/NativeLlcpSocket.java
fc/dhimpl/NativeNfcManager.java
fc/dhimpl/NativeNfcSecureElement.java
fc/dhimpl/NativeNfcTag.java
fc/dhimpl/NativeP2pDevice.java
|
| ff94ceff4c2715134c85a84c75d47a5835f1a598 |
25-Jul-2012 |
Martijn Coenen <maco@google.com> |
Revert "Move NXP JNI and DeviceHost implementation into separate dir."
This reverts commit 26f6049196acaa9768ba6bdef343216ea878a4c1.
fc/dhimpl/NativeLlcpConnectionlessSocket.java
fc/dhimpl/NativeLlcpServiceSocket.java
fc/dhimpl/NativeLlcpSocket.java
fc/dhimpl/NativeNfcManager.java
fc/dhimpl/NativeNfcSecureElement.java
fc/dhimpl/NativeNfcTag.java
fc/dhimpl/NativeP2pDevice.java
|
| 26f6049196acaa9768ba6bdef343216ea878a4c1 |
20-Jul-2012 |
Martijn Coenen <maco@google.com> |
Move NXP JNI and DeviceHost implementation into separate dir.
Preparation for the new NCI stack. The idea is to
build either the NXP or the NCI stack, triggered
by a makefile switch. To that end, move the
DeviceHost and JNI implementations in their own
directory, so we can build them only if needed.
Change-Id: Ibb6aeb11f0bb887e153fd457860b1ad0e39e7933
fc/dhimpl/NativeLlcpConnectionlessSocket.java
fc/dhimpl/NativeLlcpServiceSocket.java
fc/dhimpl/NativeLlcpSocket.java
fc/dhimpl/NativeNfcManager.java
fc/dhimpl/NativeNfcSecureElement.java
fc/dhimpl/NativeNfcTag.java
fc/dhimpl/NativeP2pDevice.java
|