summaryrefslogtreecommitdiffstats
path: root/nxp
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Stop building NXP stack."Bruno Martins2016-12-301-5/+1
| | | | | | This reverts commit 988c3fff5470a1de3a880bd07fa438cc47e283c8. Change-Id: I787ea2b8a2c6977cefb1ad72952b8a1ed7a52660
* Implementation of HCE for NFC-F.Yoshinobu Ito2016-01-221-8/+36
| | | | | | | | | | This impementation includes HCE(Host-based Card Emulation) for NFC-F which emulates NFC Forum Type 3 Tag on a smartphone. Signed-off-by: Daisuke Ito <DaisukeE.Ito@jp.sony.com> Yoshinobu Ito <Yoshinobu.Ito@jp.sony.com> Change-Id: I1618a7fba801e0705ff3cc078206a1446b3dd56d
* am 46c6f9cf: am b6b45036: Merge "Expose peer LLCP version to apps."Martijn Coenen2015-04-171-0/+6
|\ | | | | | | | | * commit '46c6f9cf5ef0b881006da34c73b4622cff148abd': Expose peer LLCP version to apps.
| * Expose peer LLCP version to apps.Martijn Coenen2015-04-151-0/+6
| | | | | | | | Change-Id: Id5ea699a8508b5bdf44c0bae2d38893e2c42241a
* | Stop building NXP stack.Martijn Coenen2015-04-091-1/+5
|/ | | | | | Code is planned to be removed post-M. Change-Id: Icca447a788b2c5f4b4b8415c3d39a0a728b58015
* am 9d734bdf: Merge "Add missing includes."Elliott Hughes2015-01-295-5/+10
|\ | | | | | | | | * commit '9d734bdf2c98e4408d1bf4645a805c24da9c604d': Add missing includes.
| * Add missing includes.Elliott Hughes2015-01-285-5/+10
| | | | | | | | Change-Id: I1dc1227e9800a46fdf44bd8f18a76c20adad5e5e
* | Fix crash in ReaderMode API for NakasiAndres Morales2014-12-031-1/+1
| | | | | | | | | | | | | | https://code.google.com/p/android/issues/detail?id=80953&q=nfc&colspec=ID%20Type%20Status%20Owner%20Summary%20Stars Bug:18611560 Change-Id: I0f12b5b569ae32d604a106feb3334f4092c43b34
* | Prevent Beam at the lockscreen and during provisioningAndres Morales2014-11-192-6/+18
|/ | | | | | | | | | | 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
* Reinstate RF field events.Martijn Coenen2014-09-082-0/+18
| | | | | | | | | 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
* Fix deadlock.Martijn Coenen2014-08-111-18/+20
| | | | | Bug: 16958324 Change-Id: I0cc7b4b9d400727cc6e59ad7d5440dfb2842edbe
* Support for configuring SE listen technologies.Martijn Coenen2014-07-251-0/+6
| | | | | | | | | | | 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
* Don't conditionally enable snooze.Martijn Coenen2014-06-271-1/+1
| | | | | | We keep our devices in snooze by default now. Change-Id: Ia84635031d60221da054448b8c81c5c48f1f821d
* Refactoring NfcService routing logic.Andres Morales2014-06-252-85/+34
| | | | | | | | | | | 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
* Fix duplicate tag dispatch after NFC triggered unlockAndres Morales2014-06-201-4/+14
| | | | | | | | | | | 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
* Goodbye secure element.Martijn Coenen2014-05-197-1174/+0
| | | | | | | | | 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
* am 5f9671d0: am 4f4e0ca5: am 99f3cc61: Merge "Fix warnings in the JNI code"Narayan Kamath2014-04-307-41/+43
|\ | | | | | | | | * commit '5f9671d0ff91bfd66dd84b2dcf57b21da4eecba9': Fix warnings in the JNI code
| * Fix warnings in the JNI codeAshok Bhat2014-04-307-41/+43
| | | | | | | | | | | | Change-Id: I5bd8198e4f61fbddf0ff7e42d8ce55f54d8aed12 Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | am 4143f576: am 780456b9: Merge "Fix thread deadlock issue - Removed the ↵Martijn Coenen2014-04-151-1/+1
|\| | | | | | | | | | | | | dependency" * commit '4143f576a81fa0cba29718908dcb136a4642ef39': Fix thread deadlock issue - Removed the dependency
| * Merge "Fix thread deadlock issue - Removed the dependency"Martijn Coenen2014-04-151-1/+1
| |\
| | * Fix thread deadlock issue - Removed the dependencyjie fang2013-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | am 0c6df1db: am 6f6e8bf6: Merge "nfc: use uintptr_t to cast between pointer ↵Colin Cross2014-04-091-2/+2
|\| | | | | | | | | | | | | | | | | | | | and uint8_t" * commit '0c6df1db51d02fcaaa2dbf81dafd3455d87876cb': nfc: use uintptr_t to cast between pointer and uint8_t
| * | nfc: use uintptr_t to cast between pointer and uint8_tColin Cross2014-04-081-2/+2
| | | | | | | | | | | | | | | | | | | | | Fixes make checkbuild when packages is removed from 64-bit blacklist. Change-Id: Ic2355722f1bb5b856942761288609c68a7c7012b
| * | Use long for java member variables that hold a native pointerAshok Bhat2014-03-063-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Revert "Refactoring NfcService routing logic."Andres Morales2014-02-042-31/+25
| | | | | | | | | | | | | | | | | | This reverts commit 80e61a46c0541471ef01a9d3c91570139336bcff. Change-Id: I0b4fc471a3dae22c4d732b1c002f51a412c2c121
* | | Refactoring NfcService routing logic.Andres Morales2014-02-032-25/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | nfc-64 part 1: store native structure in a long rather than an intAndres Morales2013-12-183-5/+5
| | | | | | | | | | | | Change-Id: I3ff21d3f1ad0f8e9e643c84fecd4c45a1b373133
* | | Expose snooze mode config and polling modes in java layerAndres Morales2013-12-162-4/+31
|/ / | | | | | | Change-Id: I3a604fb4260a1e99e6aa40189e999996d5947ed4
* | Increase reader mode pull duration.Martijn Coenen2013-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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
* | Reader API: disable LPTD on NCI devices when in reader mode.Martijn Coenen2013-09-121-17/+5
| | | | | | | | | | | | | | To improve reader performance. Bug: 10360259 Change-Id: I3a76563b876aafa9c8cd555127a32f8c8e5bfd14
* | Implement reader mode API for NXP chipsets.Martijn Coenen2013-09-034-6/+75
| | | | | | | | | | Bug: 10360259 Change-Id: I1339840ed900b73d3f9ae43e1a01b59c7e679f9e
* | Changes for callback model of reader mode APIs.Martijn Coenen2013-09-031-9/+7
| | | | | | | | | | Bug: 10360259 Change-Id: I41c47ce84aa18bce01f6fb1ebe280fac0ed79070
* | Implement reader mode APIs.Martijn Coenen2013-08-271-0/+10
| | | | | | | | | | | | | | | | | | | | 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
* | Host-based card emulation.Martijn Coenen2013-06-101-0/+30
|/ | | | | | | | | | | | | | | | | | | | | | | | | 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
* Fix more race conditions.Martijn Coenen2013-04-251-1/+19
| | | | | | | | | | | | | | 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
* Restore discovery notification callback when (de)selecting SE.Martijn Coenen2013-04-121-0/+14
| | | | | | | | | | | | | | | | | | | | 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
* Add liblogYing Wang2013-04-091-0/+1
| | | | | Bug: 8580410 Change-Id: Ia159e97f5962b05b3cd176121ea9703310e7522b
* Return more accurate errors for NfcEe.open.Martijn Coenen2013-02-122-2/+14
| | | | | | | | | | | There are a number of different conditions under which access to the SE is not possible. Since some of these require user intervention to resolve (ie external field present), return a more accurate reason for NfcEe.open failure. Bug: 4304698 Change-Id: Ie947c29be12d554a02d9246264a9f0e026a37af8
* Fix emergency_recovery logic.Martijn Coenen2013-01-101-1/+1
| | | | Change-Id: I1ea17f15a0e627296fb46b20765c59d0998eaf2a
* Fix NFC JNI local reference and pin table leaks.Elliott Hughes2012-12-188-391/+318
| | | | | | | Also turn compiler warnings up and fix the easy ones. Bug: http://code.google.com/p/android/issues/detail?id=20441 Change-Id: I1043300f344b8296cfbb6bfad17388d5c3b314d1
* Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01The Android Open Source Project2012-12-132-0/+51
| | | | Change-Id: I3ccb25bf7cde2c22f52260cae0e9957517e6bb5f
* Point jni class references to new dhimpl package.Martijn Coenen2012-07-257-20/+20
| | | | | | | The DeviceHost classed moved to a new package, updated the JNI references accordingly. Change-Id: I11d30b241f80e2efba4570a921346ea3689b4ec5
* Move NXP JNI and DeviceHost implementation into separate dir.Martijn Coenen2012-07-2520-0/+8758
| | | | | | | | | | 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
* Revert "Move NXP JNI and DeviceHost implementation into separate dir."Martijn Coenen2012-07-2419-8755/+0
| | | | This reverts commit 26f6049196acaa9768ba6bdef343216ea878a4c1.
* Move NXP JNI and DeviceHost implementation into separate dir.Martijn Coenen2012-07-2419-0/+8755
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 08:09:46 +0000