summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* nxp: liblog: replace android/log.h to log/log.hstaging/lineage-15.0_rebase-android-8.0.0_r23Hiroki Yamamoto2017-10-282-2/+2
* Nfc: Include android-support-v4 for the NXP stackAdrian DC2017-10-281-0/+2
* Revert "Stop building NXP stack."Bruno Martins2017-10-283-6/+25
* Revert "Merge "NFC: Remove obsolete nxp code.""Adrian DC2017-10-2818-0/+7774
* release-request-ce5644bf-c7ec-4125-96f7-5f9bba4fe5ad-for-git_oc-dr1-release-4...android-build-team Robot2017-08-062-2/+2
|\
| * Import translations. DO NOT MERGEBill Yi2017-08-042-2/+2
* | release-request-b48c560e-9c1f-40e2-9c27-9f0f277ca978-for-git_oc-dr1-release-4...android-build-team Robot2017-08-021-0/+2
|\|
| * Set nfc.initialized system property after NFC is initialized.Ruchi Kandoi2017-08-011-0/+2
* | release-request-b6ab0986-e497-499a-b55d-25aa156be8cf-for-git_oc-dr1-release-4...android-build-team Robot2017-08-011-4/+18
|\|
| * 4bit ACK response support for Mifare Classic tags.Love Khanna2017-07-291-4/+18
* | release-request-bb5b45da-eaa6-4d79-aca0-d3dca522258f-for-git_oc-dr1-release-4...android-build-team Robot2017-07-272-2/+3
|\|
| * Show Bluetooth device name on pairing confirmation dialogHiroki Yamamoto2017-07-252-2/+3
* | release-request-52da03e1-319b-479f-b7b2-2df79bc638cf-for-git_oc-dr1-release-4...android-build-team Robot2017-07-231-2/+2
|\|
| * Reader Mode should disable HCERuchi Kandoi2017-07-211-2/+2
| * Merge "DTA support and extensions added." into oc-dr1-devTreeHugger Robot2017-07-2111-8/+1127
| |\
| | * DTA support and extensions added.Ruchi Kandoi2017-07-2011-8/+1127
* | | Merge cherrypicks of [2578939, 2578955, 2578902] into oc-dr1-releaseandroid-build-team Robot2017-07-2111-8/+1127
|\ \ \
| * | | DTA support and extensions added.Ruchi Kandoi2017-07-2111-8/+1127
|/ / /
* | | release-request-33bed271-4c31-4f48-8614-93bbb183fe4a-for-git_oc-dr1-release-4...android-build-team Robot2017-07-201-0/+1
|\| |
| * | Flush writer to make sure java and native logging are not interleaved.Ruchi Kandoi2017-07-191-0/+1
| |/
* | release-request-ce4c09a7-d626-4edd-9c59-231ca7b79b49-for-git_oc-dr1-release-4...android-build-team Robot2017-07-181-2/+5
|\|
| * Power sub state and CON_DISC_PARAM seqence update.Love Khanna2017-07-171-2/+5
* | release-request-4595c00b-3a4c-419f-96ea-b7c0015df602-for-git_oc-dr1-release-4...android-build-team Robot2017-07-164-14/+19
|\|
| * Add native logging for libnfc-nciRuchi Kandoi2017-07-124-14/+19
* | release-request-bf3460d4-15ec-4b2b-816a-b106ef372c4b-for-git_oc-dr1-release-4...android-build-team Robot2017-07-0915-134/+611
|\|
| * NCI2.0 Support for AID suffix registration.Love Khanna2017-07-068-68/+380
| * NCI2.0 Screen state and power sub state management.Love Khanna2017-07-065-12/+165
| * NCI2.0 update LF_T3T_PARAMETERS of 18 byte.Love Khanna2017-07-065-16/+22
| * NCI 2.0: Removed RF_FIELD_INFO config param update during P2P.Love Khanna2017-07-061-22/+28
| * ISO15693 standardized as defined in NCI 2.0Love Khanna2017-07-065-16/+16
| * Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 1930155714 -...Ruchi Kandoi2017-06-210-0/+0
| |\
| | * Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 1930155714 -...Ruchi Kandoi2017-06-210-0/+0
| | |\
| | | * Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 1930155714 -...Ruchi Kandoi2017-06-210-0/+0
| | | |\
| | | | * Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 1930155714 -...Ruchi Kandoi2017-06-210-0/+0
| | | | |\
| | | | | * Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 1930155714 -...Ruchi Kandoi2017-06-210-0/+0
| | | | | |\
| | | | | | * Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 1930155714 -...Ruchi Kandoi2017-06-210-0/+0
| | | | | | |\
| | | | | | | * Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 1930155714 -...Ruchi Kandoi2017-06-210-0/+0
| | | | | | | |\
| | | | | | | | * Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 1930155714 -...Ruchi Kandoi2017-06-210-0/+0
| | | | | | | | |\
| | | | | | | | | * Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 1930155714 -...Ruchi Kandoi2017-06-210-0/+0
| | | | | | | | | |\
| | | | | | | | | | * Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 1930155714 -...Ruchi Kandoi2017-06-210-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 1930155714 -...Ruchi Kandoi2017-06-210-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 1930155714 -...Ruchi Kandoi2017-06-210-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * Add READ_EXTERNAL_STORAGE for file based Uri while beaming.Ruchi Kandoi2017-06-210-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Add READ_EXTERNAL_STORAGE for file based Uri while beaming.Ruchi Kandoi2017-06-161-2/+18
| * | | | | | | | | | | | | | Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 6b398ec7b3 am...Ruchi Kandoi2017-06-210-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 6b398ec7b3 am...Ruchi Kandoi2017-06-210-0/+0
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 6b398ec7b3 am...Ruchi Kandoi2017-06-210-0/+0
| | | |\| | | | | | | | | | |
| | | | * | | | | | | | | | | Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 6b398ec7b3 am...Ruchi Kandoi2017-06-210-0/+0
| | | | |\| | | | | | | | | |
| | | | | * | | | | | | | | | Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 6b398ec7b3 am...Ruchi Kandoi2017-06-210-0/+0
| | | | | |\| | | | | | | | |
| | | | | | * | | | | | | | | Add READ_EXTERNAL_STORAGE for file based Uri while beaming. am: 6b398ec7b3 am...Ruchi Kandoi2017-06-210-0/+0
| | | | | | |\| | | | | | | |