summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-06Merge "Fix native crash in nfc_ncif_proc_activate"HEADandroid-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4nougat-iot-releasen-iot-preview-4mastermainTreehugger Robot
2016-12-06Fix native crash in nfc_ncif_proc_activatefang.x.chen
The destination of memcpy is allocated with a predetermined maximum length, but in some cases the length of information being copied is greater than the maximum length of the destination. This is the root cause of crash. Add length check before memcpy to avoid memory overflow Test: Repeat reading and writing tag Bug: 32688507 Change-Id: I09ee3c734e9be38a35b1d48679d74e42e0432d78
2016-11-18Merge "Split libhidl into base and transport."Treehugger Robot
2016-11-17Split libhidl into base and transport.Yifan Hong
Bug: 32756130 Test: mma Change-Id: Ica6152ef258f0ac2c9e1cab5f77bd59801155651
2016-10-18Merge "Remove Bluetooth remnants in bt_target.h and bt_trace.h"Andre Eisenbach
2016-10-18Merge "Remove btu_api.h"Andre Eisenbach
2016-10-18Merge "Remove DYNAMIC_MEMORY_* compile flags"Andre Eisenbach
2016-10-18Remove Bluetooth remnants in bt_target.h and bt_trace.hAndre Eisenbach
Test: compiles Change-Id: Ic11c6e6fbb3a9b5016b96ab7ef280bd708e99e92
2016-10-18Remove btu_api.hAndre Eisenbach
Empty file is empty. Test: compiles Change-Id: Ie6fda095a7b740a5f8e00f68da52a608d0b6d5fe
2016-10-18Remove DYNAMIC_MEMORY_* compile flagsAndre Eisenbach
Unused and adding unecessary complexity. Also step 1 in removing GKI*. Test: compiles Change-Id: I338ce3041f5c928924a9dcc8ad4e73bc1c914163
2016-10-17Merge "update NfcAdaptation to match style."Treehugger Robot
2016-10-14update NfcAdaptation to match style.Steven Moreland
Test: make libnfc-nci Change-Id: I75196396c8c770576a8be8f883ac57c59b0370a1
2016-10-06Merge "Revert "Revert "Revert "update NfcAdaptation to match style.""""android-n-mr1-preview-2android-n-mr1-preview-1Steven Moreland
2016-10-06Revert "Revert "Revert "update NfcAdaptation to match style."""Steven Moreland
This reverts commit 9c54ce12fc6f13808cc8433a86cc7fdbcb0caee0. Change-Id: Ia184f56682c83a6d39930a5c6dabafc2e3aadbf6
2016-10-05Merge "Revert "Revert "update NfcAdaptation to match style."""Treehugger Robot
2016-10-05Revert "Revert "update NfcAdaptation to match style.""Steven Moreland
This reverts commit 435f762e21347ad91af7e1cccd58b903a7e18049. Change-Id: Id67433919e0ba092082823d351a63e7438f689e8
2016-10-04Merge "Revert "update NfcAdaptation to match style.""Martijn Coenen
2016-10-04Revert "update NfcAdaptation to match style."Steven Moreland
This reverts commit 09ea22663312135b9a542ac8c20274de75799cc5. Change-Id: I83e6e9cfddee9f5c0534e5720315e3da6245f49b
2016-10-04Merge "update NfcAdaptation to match style."Steven Moreland
2016-09-29Merge "nfc: ALOGD redefinition warning"Treehugger Robot
2016-09-29nfc: ALOGD redefinition warningMark Salyzyn
OverrideLog.h needs to be included first because android/log.h gets included as a side effect in many of the source files. Test: build no longer produces warning ALOGD macro redefinition Bug: 26552300 Bug: 31289077 Change-Id: I655bb0af45728c20d6fea93a7ac69e2df4858453
2016-09-29update NfcAdaptation to match style.Steven Moreland
Test: make libnfc-nci Change-Id: Ifc087e16025ebd734f0b472600e0d8fe921d7f38
2016-09-29Merge "Switch to using the NFC HIDL HAL."Martijn Coenen
2016-09-26Switch to using the NFC HIDL HAL.Martijn Coenen
The framework communicates with the NFC via libnfc-nci. This patch converts libnfc-nci to talk to the NFC via the HIDL NFC HAL (android.hardware.nfc@1.0) defined in hardware/interfaces/nfc/1.0 b/31688271 related to b/31748996 Test: pass Change-Id: Ib8ebcfb5f3998bba025e9559ab52e1f9eacc4df6
2016-09-22Merge "Fix log warnings in libnfc-nci"Treehugger Robot
2016-09-18Fix log warnings in libnfc-nciColin Cross
system/core/include is included in the global include path using -isystem, which hides all warnings. Move LOG_TAG definitions before including OverrideLog.h, which includes log/log.h, in order to fix macro redefinition warnings. Fix a size_t log format warning. Also disable missing field initializer warnings. Test: m -j native Bug: 31492149 Change-Id: I4877a184ab55c3836081631b201943ef02d56a35
2016-07-22Merge \"Fix the syncronization issue between read thread and write thread\"Jizhou Liao
am: d0c8ccb266 Change-Id: I8d2a758c2404a1feb3c8b02c63fa1a1c69406e99
2016-07-22Merge "Fix the syncronization issue between read thread and write thread"Martijn Coenen
2016-07-20Merge \"Fix crash issue on reading ISO-15693 tag with more than 255 bytes ↵Jizhou Liao
NDef message.\" am: 95dfb6957a Change-Id: I7e7d0fc8f51a4959cc19e58a64a4b1c7646b8195
2016-07-20Merge "Fix crash issue on reading ISO-15693 tag with more than 255 bytes ↵Martijn Coenen
NDef message."
2016-06-24Merge \\"Fix warnings in HAL.\\" am: 1d38b130f3Jizhou Liao
am: 4e862f34b5 Change-Id: I7c6757ba5e303502e38081be6349d739796d45fa
2016-06-24Merge \"Fix warnings in HAL.\"Jizhou Liao
am: 1d38b130f3 Change-Id: I14715b308bbf760d5de72348b15d30284e509457
2016-06-24Merge "Fix warnings in HAL."android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Treehugger Robot
2016-06-16Fix warnings in HAL.Jizhou Liao
Fix warnings in HAL. Change-Id: I65367c9d9d90b8cf0897880b01d4930f1a836294
2016-06-15Fix crash issue on reading ISO-15693 tag with more than 255 bytes NDef message.Jizhou Liao
There is a null pointer crash if the data of block doesn't contain any NDef message data.
2016-06-15Retry system calls on EINTR.Martijn Coenen
am: 923afa2d76 Change-Id: Ib9e2f8930459b18ba7f31b855746f25939f29183
2016-06-14Retry system calls on EINTR.android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-devnougat-cts-releasenougat-bugfix-releaseMartijn Coenen
Bug: 28792238 Change-Id: Iaeb03a5be6d04cbc8dcf838ed7a0489d790e0028
2016-05-31Fix the syncronization issue between read thread and write threadJizhou Liao
NFC stack hang if Read Interrupt is notified even before the write callback is notified. Add 2ms delay to give priority to write thread if it is busy.
2016-05-13Merge "Adding robustness to t3t callback function" am: c0e3e1e612Martijn Coenen
am: 34167af9fc * commit '34167af9fca6c9669de5ea8a2301d1df63729ec2': Adding robustness to t3t callback function Change-Id: Id311151df14cbe2d2cd379d9b215c996f2dd6ff3
2016-05-13Merge "Adding robustness to t3t callback function"Ken Wahid
am: c0e3e1e612 * commit 'c0e3e1e612e0ec448c28e3e4fd0e8e26b91e2876': Adding robustness to t3t callback function Change-Id: I8b152022f06147dc11de640b25ad9fafb0390b7b
2016-05-13Merge "Adding robustness to t3t callback function"android-wear-n-preview-3android-wear-n-preview-1android-n-preview-4android-n-preview-3Martijn Coenen
2016-05-13Merge "Fix warnings in external/libnfc-nci/src." am: cc6d4f1381Martijn Coenen
am: 2e97d51430 * commit '2e97d5143065b98b57cb471790e89ba723a3c786': Fix warnings in external/libnfc-nci/src. Change-Id: Ib953900f68195e4d663a744398d29731d7282028
2016-05-13Merge "Fix warnings in external/libnfc-nci/src."Jizhou Liao
am: cc6d4f1381 * commit 'cc6d4f138145d79f4314eb6488a065a6c0ff0fa9': Fix warnings in external/libnfc-nci/src. Change-Id: I1d43fdcd9a5982fe81ef350c8f7adae7003905b1
2016-05-13Merge "Fix warnings in external/libnfc-nci/src."Martijn Coenen
2016-05-12Free memory in case of error responseJizhou Liao
am: 5340dae86f * commit '5340dae86f4e2bb697cccd0f586501b52a784db5': Free memory in case of error response Change-Id: I4ff1711f5f44e09e319f9befe95b65e8555463b7
2016-05-11Merge "Free memory in case of error response" am: 3a6393f85fMartijn Coenen
am: ce0c63a05f * commit 'ce0c63a05ff779753b54b23a09ac6724d64cab71': Free memory in case of error response Change-Id: I2e2ef6f956789cd62e72a9ce7799ccfcd0cdb31c
2016-05-11Merge "Free memory in case of error response"Jizhou Liao
am: 3a6393f85f * commit '3a6393f85fc6099f1dd7a58c006af76f9e8b1be0': Free memory in case of error response Change-Id: If2152327b6dcad73071e8b1212f84a4381dd808f
2016-05-11Merge "Support NXP PN551 NFC controller" am: 45f3ed1213Martijn Coenen
am: 511e5c8030 * commit '511e5c80302f686f24504021addd25433b605b72': Support NXP PN551 NFC controller Change-Id: I6102744f0654c50e6f30bbde36153011d7056d49
2016-05-11Merge "Support NXP PN551 NFC controller"Jizhou Liao
am: 45f3ed1213 * commit '45f3ed12138951fba05ac093864f372dfdc4968c': Support NXP PN551 NFC controller Change-Id: I6865981dc5e98dd0fbeb151048d56b251fe3d090
2016-05-11Free memory in case of error responseJizhou Liao
In case of NFC_DATA_CEVT with error response, p_data is allocated as p_msg from nfc_main_hal_data_cback(), here to free this buffer to avoid memory leak. Bug: 28181917 Change-Id: I74bbb5c2f7956eb246b38c25a1e8c56922ee56ab
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 08:30:21 +0000