summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Disable hardware acceleration"android-o-iot-preview-5o-iot-preview-5Treehugger Robot2017-08-081-0/+1
|\
| * Disable hardware accelerationAtsushi Kawano2017-08-081-0/+1
* | Merge "Convert jni files from C to C++"Treehugger Robot2017-08-0821-152/+100
|\ \ | |/ |/|
| * Convert jni files from C to C++Ruchi Kandoi2017-08-0721-152/+100
|/
* Merge "Prevents fatal crash when wifi-connect tags are read multiple times."Treehugger Robot2017-08-021-0/+1
|\
| * Prevents fatal crash when wifi-connect tags are read multiple times.Ruchi Kandoi2017-08-021-0/+1
|/
* Merge "Mark configuration strings as non-translatable"Treehugger Robot2017-08-02158-4187/+4
|\
| * Mark configuration strings as non-translatableHiroki Yamamoto2017-08-01158-4187/+4
* | Merge "Set nfc.initialized system property after NFC is initialized."Ruchi Kandoi2017-08-011-0/+2
|\ \
| * | Set nfc.initialized system property after NFC is initialized.Ruchi Kandoi2017-08-011-0/+2
|/ /
* | Merge "4bit ACK response support for Mifare Classic tags."Treehugger Robot2017-07-311-4/+18
|\ \ | |/ |/|
| * 4bit ACK response support for Mifare Classic tags.Love Khanna2017-07-281-4/+18
|/
* Merge "Reader Mode should disable HCE"Treehugger Robot2017-07-221-2/+2
|\
| * Reader Mode should disable HCERuchi Kandoi2017-07-211-2/+2
* | Merge "DTA support and extensions added."Treehugger Robot2017-07-2111-8/+1127
|\ \
| * | DTA support and extensions added.Ruchi Kandoi2017-07-2111-8/+1127
|/ /
* | Merge "packages/apps/Nfc: use proper nativehelper headers"Treehugger Robot2017-07-2010-18/+18
|\ \
| * | packages/apps/Nfc: use proper nativehelper headersSteven Moreland2017-07-1910-18/+18
* | | Merge "Flush writer to make sure java and native logging are not interleaved."Treehugger Robot2017-07-191-0/+1
|\ \ \ | |/ / |/| |
| * | Flush writer to make sure java and native logging are not interleaved.Ruchi Kandoi2017-07-191-0/+1
* | | Merge "Power sub state and CON_DISC_PARAM seqence update."android-o-preview-4Treehugger Robot2017-07-171-2/+5
|\| | | |/ |/|
| * Power sub state and CON_DISC_PARAM seqence update.Love Khanna2017-07-171-2/+5
|/
* Merge "Add native logging for libnfc-nci"Ruchi Kandoi2017-07-134-14/+19
|\
| * Add native logging for libnfc-nciRuchi Kandoi2017-07-124-14/+19
|/
* Merge changes from topic 'NCI-2.0'Ruchi Kandoi2017-07-0612-96/+567
|\
| * 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
|/
* Merge "Remove unused code DefaultRemovedActivity"Treehugger Robot2017-07-062-58/+0
|\
| * Remove unused code DefaultRemovedActivityHiroki Yamamoto2017-06-202-58/+0
* | Merge changes from topic 'nci2.0_first_set'Ruchi Kandoi2017-06-295-38/+44
|\ \ | |/ |/|
| * NCI 2.0: Removed RF_FIELD_INFO config param update during P2P.Love Khanna2017-06-281-22/+28
| * ISO15693 standardized as defined in NCI 2.0Love Khanna2017-06-285-16/+16
|/
* Merge "Beam: aim intents directly to com.android.bluetooth for cancel intent"Treehugger Robot2017-06-205-8/+15
|\
| * Beam: aim intents directly to com.android.bluetooth for cancel intentAkinobu Nakashima2017-06-195-8/+15
* | Merge "Add OWNERS in packages/apps/Nfc"Treehugger Robot2017-06-161-0/+2
|\ \
| * | Add OWNERS in packages/apps/NfcChih-Hung Hsieh2017-06-151-0/+2
|/ /
* | Merge "Show Bluetooth device name on pairing confirmation dialog"Treehugger Robot2017-06-132-2/+3
|\ \
| * | Show Bluetooth device name on pairing confirmation dialogHiroki Yamamoto2017-06-122-2/+3
|/ /
* | Merge "Cancel Android Beam in case the dialog is closed"Ruchi Kandoi2017-06-081-0/+16
|\ \ | |/ |/|
| * Cancel Android Beam in case the dialog is closedRuchi Kandoi2017-06-071-0/+16
|/
* Merge "Set hiddenSSID flag to connect to Wi-Fi AP even in stealth mode"android-o-preview-3android-n-iot-preview-4n-iot-preview-4Treehugger Robot2017-05-051-0/+1
|\
| * Set hiddenSSID flag to connect to Wi-Fi AP even in stealth modeHiroki Yamamoto2017-05-041-0/+1
* | Merge "Don't dispatch live case tag if live cases are disabled"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2Treehugger Robot2017-04-272-8/+12
|\ \
| * | Don't dispatch live case tag if live cases are disabledHiroki Yamamoto2017-04-272-8/+12
* | | Merge "Turn off logspam"Treehugger Robot2017-04-2720-648/+645
|\ \ \ | |/ / |/| |
| * | Turn off logspamJoe Onorato2017-04-2720-648/+645
|/ /
* | Merge "liblog: replace android/log.h to log/log.h"Treehugger Robot2017-04-121-1/+1
|\ \ | |/ |/|
| * liblog: replace android/log.h to log/log.hHiroki Yamamoto2017-04-121-1/+1
|/
* Merge "Remove unnecessary code loading unused sound resource"Treehugger Robot2017-04-071-12/+0
|\
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-12 17:45:11 +0000