summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Nfc: UG translationscm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2sahranbay2013-10-121-0/+31
| | | | Change-Id: I1f703f0c59a8b4e1f3da16821fe1d22e07c15fea
* Update translatable.Danny Baumann2013-07-301-1/+1
| | | | Change-Id: I221ba5fabb7642d16bec081b184c14f82b596976
* NativeNfcManager: fix buildXpLoDWilD2013-07-261-13/+6
| | | | Change-Id: I834c9882641b540f04d528b9995ba9ff9806fb06
* Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-2594-1254/+2301
|\ | | | | | | | | | | | | | | | | | | | | Android 4.3 release 2.1 Conflicts: nxp/jni/com_android_nfc_NativeNfcManager.cpp nxp/jni/com_android_nfc_NativeNfcTag.cpp res/values-nl/strings.xml Change-Id: I2e53f288cd65fc179d5c385971e703f6eda0c232
| * merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-130-0/+0
| |\
| | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-06-020-0/+0
| | |\
| | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-260-0/+0
| | | |\
| | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-220-0/+0
| | | | |\
| | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-130-0/+0
| | | | | |\
| | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-020-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-290-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-220-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-180-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-160-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-150-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-100-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-090-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-080-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-010-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-280-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-260-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * Don't dynamically enable/disable UICC timeout.Martijn Coenen2013-03-181-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary disable this until we figure out what's going on in Manta. Change-Id: I2cf54bd7c7d3da1a7f309a936b982bf8e7109673
| * | | | | | | | | | | | | | | | | | Properly dispatch "play key" into the system.Martijn Coenen2013-06-121-7/+17
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When pairing a Bluetooth headset, directly dispatch Play KeyEvents to AudioService, to ensure that the current active stack of registered MediaButtonReceivers is honored. Bug: 9389201 Change-Id: Idce1d28d684134cd8f69e2fb2304747c7b6b8fe8
| * / / / / / / / / / / / / / / / / Check for proper SE open return values on wipe.Martijn Coenen2013-05-311-2/+2
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9227578 Change-Id: Iff9e9512ac4d8e25a287ce40fba7c2717b4419fa
| * / / / / / / / / / / / / / / / Use top activity when determining foreground package.Martijn Coenen2013-05-221-1/+1
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you have an activity stack where the base activity belongs to a different package, NfcService would use the wrong package for determining whether the current foreground app is allowed to have an ndef message (callback) set. This could cause Activity stacks like Settings -> Storage -> Pictures & Videos -> Gallery to fail sending pictures. Use the top activity instead. Bug: 9072009 Change-Id: I32fbbea1423333117d2a0522eced98ecf9a758e7
| * | | | | | | | | | | | | | | Merge "Broadcast LLCP events in debug builds." into jb-mr2-devMartijn Coenen2013-05-211-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Broadcast LLCP events in debug builds.Martijn Coenen2013-05-201-0/+18
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8839848 Change-Id: I01a18b3409da66ab1394c2c196a06a8749b9c72c
| * | | | | | | | | | | | | | Merge "Use the right icon when sending pictures with Beam." into jb-mr2-devMartijn Coenen2013-05-101-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Use the right icon when sending pictures with Beam.Martijn Coenen2013-05-101-4/+8
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8912227 Change-Id: I9731de68019a90a683b87582536ba7df2a351e49
| * / / / / / / / / / / / / Don't overwrite SWP_CFG on SE pipe enable/disable.Martijn Coenen2013-05-011-23/+47
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different BCM2079x revisions have different interpretations for bits in the SWP_CFG config parameter. Instead of overwriting whatever is there, read the current value, and just set/unset the bit for UICC_IDLE timeout as desired. Bug: 8776949 Change-Id: I33807aef1e94cfa6a2f4af0dd6a46dae630d850f
| * | | | | | | | | | | | Fix more race conditions.Martijn Coenen2013-04-252-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | Avoid P2P/SMX race conditions in NXP stack.Martijn Coenen2013-04-242-0/+20
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google Wallet can trigger off field P2P field events and initiate communication with the SMX. The NXP stack appears to contain some tricky race conditions around opening/closing the SMX close to P2P interactions. For now, do not allow NFCEE access while a P2P link is still active. Bug: 8552749 Change-Id: I7acae39bc22cebb5d79a484990dcd3fc5f3dad23
| * / / / / / / / / / / Don't close the NFC-EE pipe immediately on disable.Martijn Coenen2013-04-181-0/+26
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The combination of an outstanding APDU request together with a "warm-reset" HCI command that we send on NFC disable sometimes cause a complete NFC controller lockup (depending on the order and timing). To prevent this, delay closing the NFC-EE pipe for a while on NFC disable to give processes a chance to finish their outstanding APDU request. Bug: 8660403 Change-Id: I40d5f33fc41453aa3592a50721b8bef793e0af5d
| * / / / / / / / / / Fix RF field stuck on race condition.Martijn Coenen2013-04-161-1/+7
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we deactivate a tag to sleep after an NDEF check, we're waiting for a DEACTIVATE_NTF event from the core stack to unblock us. However, there is a code path where we can be unblocked even without a DEACTIVATE_NTF event. If you'd happen to remove the tag right after the deactivation, we'd be getting read/write interface errors, which erroneously unblock the deactivate before it has been completed. Then, we send another deactive command to go back to discovery. However, because the previous deactivate is still pending, the deactivate to discovery command gets dropped, and we stay in a situation where the RF field is stuck on, burning power. For now fix by adding RW_INTF_ERROR_EVTs to the list of events that do not unblock a thread waiting on deactivate. Ideally no other event is allowed to unblock, but we'll need more time to verify that is actually true. Bug: 8616351 Change-Id: I381046f0320fd4b31c5ec65d54ef2e9530c3b13c
| * | | | | | | | | Merge "Don't restart RF discovery if not needed." into jb-mr2-devMartijn Coenen2013-04-151-9/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Don't restart RF discovery if not needed.Martijn Coenen2013-04-151-9/+7
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to restart RF discovery is the current routing is already applied. Bug: 8508568 Change-Id: If4c2b4fef9211bbd0708e72a82e9726e43dd7857
| * | | | | | | | | Merge "Remain compatible with 4.1 handover-over-SNEP devices." into jb-mr2-devMartijn Coenen2013-04-151-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Remain compatible with 4.1 handover-over-SNEP devices.Martijn Coenen2013-04-151-1/+1
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android Jelly Bean 4.1 shipped with a handover implementation that (erroneously) used the SNEP server for exchanging handover messages. This was corrected in future releases, however to maintain compatibility with the 4.1 devices, continue connecting to SNEP in case a connection to the handover service fails. Bug: 8508568 Change-Id: I49ee98ef9c4569bdbff8aab4ee3f45264e019f3f
| * / / / / / / / 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
| * | | | | | | Merge "Add liblog" into jb-mr2-devYing Wang2013-04-102-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Add liblogYing Wang2013-04-092-0/+2
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8580410 Change-Id: Ia159e97f5962b05b3cd176121ea9703310e7522b
| * | | | | | | Fix Beam animation deadlock.Martijn Coenen2013-04-091-25/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a path possible where finish() was being called while a screenshot was still captured on another thread. When the thread finished, it would throw up the animation and never exit. This fix stores the request to finish() in the state, waits for the screenshot thread to complete, and moves to the IDLE state in case. Also made the entire view touchable for initiating the Beam. Bug: 8576613 Bug: 8578026 Change-Id: I0d0158fb95918e23e32dc22c6537f5dac2aa46b1
| * | | | | | | Merge "Properly reset field / listen mode flags in SE object." into jb-mr2-devMartijn Coenen2013-04-094-14/+69
| |\ \ \ \ \ \ \
| | * | | | | | | Properly reset field / listen mode flags in SE object.Martijn Coenen2013-04-094-14/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On NFC disable, the SE object is "finalized" but not destroyed. It is reused on the next NFC enable, but the listen mode / field status flags were not cleared then. Bug: 8574917 Bug: 8489820 Change-Id: I8e11c60eda47762404a5d5020a0c2e6ff95ead2a
| * | | | | | | | Merge "Improve Kovio reading reliability." into jb-mr2-devMartijn Coenen2013-04-091-0/+10
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Improve Kovio reading reliability.Martijn Coenen2013-04-091-0/+10
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NfcBarcode tags such as Kovio are only activated very briefly, just to spit out the uid. Consequent NDEF and reconnect() calls by the NfcService will often fail, causing the tag to not be reported properly to the upper layers. For now, don't perform NDEF checking on these tags, and just dispatch them when we see them. Bug: 8576348 Change-Id: If011f6e99d85a61d19d9cea15719fab90cffad43
| * / / / / / / Fix Android Beam animation.Martijn Coenen2013-04-082-6/+18
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SendUi.showStartSend() was being called twice. Change-Id: I3893c138b1de94d87e556c438bffcf0039b2a086
| * / / / / / Fixing NFC bug when confirm screen isn't required.Emily Bernier2013-04-081-1/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I198235ec91d454dabe34187bb51870cf1b0d4fb5
| * / / / / Fix race condition between NFC disabling and field events.Martijn Coenen2013-04-071-3/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This field disabled notification was not strictly necessary - we enforce it now anyway when the p2p link is disabled. Change-Id: I45dbf34daba88b58376d63e1f83778ec2373a6ca
| * / / / Deal with pre-MR2 PN544 NXP stack LLCP bugs.Martijn Coenen2013-03-299-40/+178
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In MR2 we started connecting LLCP on link activation instead of when the send was confirmed. Pre-MR2 NXP-stack devices have a bug that causes them to only send the first SYMM after 750 ms (in case they are the initiator). There is another bug that causes that same stack to crash if two threads try to send a packet at the same time. Unfortunately, this combination of factors creates the following race: 1) pre-MR2 PN544-initiator initiates p2p link with MR2 device 2) pre-MR2 PN544-initiator starts Touch to Beam animation 3) pre-MR2 PN544 doesn't have data to send, but delays SYMM for 750ms 4) MR2 device finally gets SYMM after 750ms, and sends CONNECT PDU 5) pre-MR2 PN544-initiator device responds to CONNECT PDU with CC on Thread 1 6) Within a ~50 ms window, the user on the pre-MR2 PN544-initiator touches the screen to confirm the send. This causes Thread 2 to try to send something, which fails. As a result, the Beam transaction fails. Unfortunately this is quite easy to reproduce, since the Beam animation takes about 750ms, just the same amount of time it takes for the SYMM to get sent. To prevent such a race condition, we should make sure that we do not create multi-threaded access on the remote device. The best way to do that is to not connect the LLCP services automatically when talking to a pre-MR2 PN544-initiator. Long story short, when we don't receive a first packet of data after 200 ms, we consider the remote device to be a buggy implementation, and delay the connect until the time the user decides to send something (in which case it's fine - it's unlikely the user at the other side tries to send something at exactly the same time). Also fixed RF field notifications to be more robust; whenever p2p is activated, we disable field events, and always treat the field as being on. Bug: 8508568 Change-Id: I41b427afb24c7f8d228adc91d258cca553539588
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-26 15:07:09 +0000