summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Nfc: UG translationscm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2sahranbay2013-10-121-0/+31
* Update translatable.Danny Baumann2013-07-301-1/+1
* NativeNfcManager: fix buildXpLoDWilD2013-07-261-13/+6
* Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-2594-1254/+2301
|\
| * 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
| * | | | | | | | | | | | | | | | | | Properly dispatch "play key" into the system.Martijn Coenen2013-06-121-7/+17
| |/ / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / Check for proper SE open return values on wipe.Martijn Coenen2013-05-311-2/+2
| |/ / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / Use top activity when determining foreground package.Martijn Coenen2013-05-221-1/+1
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | 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
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / /
| * / / / / / / / / / / / / Don't overwrite SWP_CFG on SE pipe enable/disable.Martijn Coenen2013-05-011-23/+47
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Fix more race conditions.Martijn Coenen2013-04-252-2/+34
| * | | | | | | | | | | | Avoid P2P/SMX race conditions in NXP stack.Martijn Coenen2013-04-242-0/+20
| |/ / / / / / / / / / /
| * / / / / / / / / / / Don't close the NFC-EE pipe immediately on disable.Martijn Coenen2013-04-181-0/+26
| |/ / / / / / / / / /
| * / / / / / / / / / Fix RF field stuck on race condition.Martijn Coenen2013-04-161-1/+7
| |/ / / / / / / / /
| * | | | | | | | | 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
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | 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
| | |/ / / / / / /
| * / / / / / / / Restore discovery notification callback when (de)selecting SE.Martijn Coenen2013-04-121-0/+14
| |/ / / / / / /
| * | | | | | | Merge "Add liblog" into jb-mr2-devYing Wang2013-04-102-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Add liblogYing Wang2013-04-092-0/+2
| | |/ / / / / /
| * | | | | | | Fix Beam animation deadlock.Martijn Coenen2013-04-091-25/+78
| * | | | | | | 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
| * | | | | | | | Merge "Improve Kovio reading reliability." into jb-mr2-devMartijn Coenen2013-04-091-0/+10
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Improve Kovio reading reliability.Martijn Coenen2013-04-091-0/+10
| | |/ / / / / /
| * / / / / / / Fix Android Beam animation.Martijn Coenen2013-04-082-6/+18
| |/ / / / / /
| * / / / / / Fixing NFC bug when confirm screen isn't required.Emily Bernier2013-04-081-1/+7
| |/ / / / /
| * / / / / Fix race condition between NFC disabling and field events.Martijn Coenen2013-04-071-3/+0
| |/ / / /
| * / / / Deal with pre-MR2 PN544 NXP stack LLCP bugs.Martijn Coenen2013-03-299-40/+178
| |/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 14:12:04 +0000