| 767ef8ffbe4b82b3081f7dc09d36a979c52759e1 |
|
04-Dec-2014 |
Andres Morales <anmorales@google.com> |
Fix crash in ReaderMode API for Nakasi
https://code.google.com/p/android/issues/detail?id=80953&q=nfc&colspec=ID%20Type%20Status%20Owner%20Summary%20Stars
Bug:18611560
Change-Id: I0f12b5b569ae32d604a106feb3334f4092c43b34
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 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
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 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
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 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
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 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
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 5a2a957ce07cafb60b649859cc326239b5c1ca55 |
|
30-Apr-2014 |
Narayan Kamath <narayan@google.com> |
am 5f9671d0: am 4f4e0ca5: am 99f3cc61: Merge "Fix warnings in the JNI code"
* commit '5f9671d0ff91bfd66dd84b2dcf57b21da4eecba9':
Fix warnings in the JNI code
|
| 53ee4de0f77a55b13359a5c44166377a126a2c85 |
|
25-Feb-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
Fix warnings in the JNI code
Change-Id: I5bd8198e4f61fbddf0ff7e42d8ce55f54d8aed12
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 439d3a0ae0ef443147f64cabb745102eafc0e701 |
|
15-Apr-2014 |
Martijn Coenen <maco@google.com> |
am 4143f576: am 780456b9: Merge "Fix thread deadlock issue - Removed the dependency"
* commit '4143f576a81fa0cba29718908dcb136a4642ef39':
Fix thread deadlock issue - Removed the dependency
|
| 780456b9e760c1c6f86019f7f83b006f97b84557 |
|
15-Apr-2014 |
Martijn Coenen <maco@google.com> |
Merge "Fix thread deadlock issue - Removed the dependency"
|
| c3d79022340897ef7641a816d086d37ec032f941 |
|
25-Feb-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
Use long for java member variables that hold a native pointer
Port to support 64-bit pointers using jlong instead of jint
in JNI modules, and long rather than int in the corresponding
Java modules.
Change-Id: I48bd244a0f7f494b8d0d325a0694fcb6c0b5bd55
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| a1e95d30dbe8dad0a8bb333b4ca17c009fc34e2f |
|
04-Feb-2014 |
Andres Morales <anmorales@google.com> |
Revert "Refactoring NfcService routing logic."
This reverts commit 80e61a46c0541471ef01a9d3c91570139336bcff.
Change-Id: I0b4fc471a3dae22c4d732b1c002f51a412c2c121
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 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
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 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
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| d2604c0544f7bc26e5b2407f0215cccfffedae2c |
|
11-Dec-2013 |
Andres Morales <anmorales@google.com> |
Expose snooze mode config and polling modes in java layer
Change-Id: I3a604fb4260a1e99e6aa40189e999996d5947ed4
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 8d154680537afa5242edeb98c8f414d6186558cf |
|
04-Oct-2013 |
Martijn Coenen <maco@google.com> |
Increase reader mode pull duration.
Also fixed a bug where gActivated is not
properly reset (scenario: turn NFC off
while doing P2P/reader) and moved some
logs to DBG. Will flick the DBG switch
later.
Bug: 10852675
Change-Id: If115ab162ddc4a080166f00cdf5e95ed4da70642
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| d6ead4d11c56cc4b1e90a93d6d5fe7583abbbfb8 |
|
12-Sep-2013 |
Martijn Coenen <maco@google.com> |
Reader API: disable LPTD on NCI devices when in reader mode.
To improve reader performance.
Bug: 10360259
Change-Id: I3a76563b876aafa9c8cd555127a32f8c8e5bfd14
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 29087d9f8c9dab704f2733818d0de20d2d88a4ad |
|
12-Sep-2013 |
jie fang <jie.fang@tieto.com> |
Fix thread deadlock issue - Removed the dependency
Root Cause: The function returned without release the thread lock while
the input parameter is an invalid value.
Change-Id: I96be6e1a36d7a5cf085a6ea88268ce7e7acc0c51
Signed-off-by: jie fang <jie.fang@tieto.com>
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 3dd24ecefb71ce4f585faa002ba1054a0c6dbd06 |
|
04-Sep-2013 |
Martijn Coenen <maco@google.com> |
Implement reader mode API for NXP chipsets.
Bug: 10360259
Change-Id: I1339840ed900b73d3f9ae43e1a01b59c7e679f9e
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 476ee8a64404b7ee042ba1a70400bcb1dd5ace10 |
|
26-Apr-2013 |
Martijn Coenen <maco@google.com> |
Fix more race conditions.
In the old NXP JNI:
- We can be in the process of discovering a tag/p2p target
when we try to configure discovery. In case ConfigureDiscovery
returns BUSY, don't immediately call abort(), but retry a few
times.
- Completely disable Tag/P2P discovery *before* opening a pipe
to the SMX. This avoids nasty races with opening the SMX
while a P2P/Tag device enters the field.
Bug: 8552749
Change-Id: I433a40c918373c661abda3bc40dd36db7b233245
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 18cbef124c779d889b538f29dfa5880951a2c59c |
|
13-Apr-2013 |
Martijn Coenen <maco@google.com> |
Restore discovery notification callback when (de)selecting SE.
When the host opens the pipe to the SE for communication,
the notification callback is temporarily changed to a
SE-specific callback. In itself this is fine, because
there can be no other devices discovered while the eSE
is connected.
However, when disconnecting the connection from the host,
the PN544 already resumes discovery. This is before we
call enableDiscover(), and before we've restored the
correct target notification callback. This race-condition
can cause a crash.
Fix it by restoring the proper notification when
(de)selecting the secure element.
Bug: 8599167
Change-Id: I26816eb8851637de18058e974b98607e4379f55d
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 959d40d8ce836c2cc6bca9cdcb81c211ee8a09cc |
|
11-Jan-2013 |
Martijn Coenen <maco@google.com> |
Fix emergency_recovery logic.
Change-Id: I1ea17f15a0e627296fb46b20765c59d0998eaf2a
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 2534d9a546f24435d9dab8168f9ea5bf8ca1eb9b |
|
18-Dec-2012 |
Elliott Hughes <enh@google.com> |
Fix NFC JNI local reference and pin table leaks.
Also turn compiler warnings up and fix the easy ones.
Bug: http://code.google.com/p/android/issues/detail?id=20441
Change-Id: I1043300f344b8296cfbb6bfad17388d5c3b314d1
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 642ab20c81425ba93e206d2a30602cd67ae8bd38 |
|
25-Jul-2012 |
Martijn Coenen <maco@google.com> |
Point jni class references to new dhimpl package.
The DeviceHost classed moved to a new package,
updated the JNI references accordingly.
Change-Id: I11d30b241f80e2efba4570a921346ea3689b4ec5
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 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
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| ff94ceff4c2715134c85a84c75d47a5835f1a598 |
|
25-Jul-2012 |
Martijn Coenen <maco@google.com> |
Revert "Move NXP JNI and DeviceHost implementation into separate dir."
This reverts commit 26f6049196acaa9768ba6bdef343216ea878a4c1.
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|
| 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
/packages/apps/Nfc/nxp/jni/com_android_nfc_NativeNfcManager.cpp
|