summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Rename Looper::isIdling() to isPolling() to resolve confusion.Jeff Brown2015-03-111-5/+6
* Merge "Fix comment on AUDIO_FORMAT_PCM_SUB_8_24_BIT"Andy Hung2015-03-101-1/+1
|\
| * Fix comment on AUDIO_FORMAT_PCM_SUB_8_24_BITAndy Hung2015-03-101-1/+1
* | Merge "Add ANativeWindow dataSpace; update graphics formats, color spaces"Eino-Ville Talvala2015-03-062-41/+196
|\ \ | |/ |/|
| * Add ANativeWindow dataSpace; update graphics formats, color spacesEino-Ville Talvala2015-03-042-41/+196
* | am ddd1ea71: am e79201e4: am 4487c605: Merge changes I0ec0fe3e,I9e5fccbaMark Salyzyn2015-03-041-0/+42
|\ \ | |/ |/|
| * am 4487c605: Merge changes I0ec0fe3e,I9e5fccbaMark Salyzyn2015-03-041-0/+42
| |\
| | * private: Add event payload structures to android_logger.hMark Salyzyn2015-03-041-0/+42
* | | am 8c52e3b7: am d851c80f: am ae19b631: Merge "liblog: add pstore read"Mark Salyzyn2015-02-261-0/+1
|\ \ \ | |/ /
| * | am ae19b631: Merge "liblog: add pstore read"Mark Salyzyn2015-02-261-0/+1
| |\ \ | | |/
| | * liblog: add pstore readMark Salyzyn2015-02-261-0/+1
* | | am ac947104: am f5579498: am 110166c1: Merge "liblog: introduce ANDROID_LOG_*...Mark Salyzyn2015-02-251-0/+6
|\ \ \ | |/ /
| * | am 110166c1: Merge "liblog: introduce ANDROID_LOG_* flags"Mark Salyzyn2015-02-251-0/+6
| |\ \ | | |/
| | * liblog: introduce ANDROID_LOG_* flagsMark Salyzyn2015-02-251-0/+6
* | | am f6fae931: am f9df4b13: am c40cf1ce: Merge "Remove useless refCounting from...Narayan Kamath2015-02-241-16/+2
|\ \ \ | |/ /
| * | am c40cf1ce: Merge "Remove useless refCounting from FileMap."Narayan Kamath2015-02-241-16/+2
| |\ \ | | |/
| | * Remove useless refCounting from FileMap.Narayan Kamath2015-02-231-16/+2
* | | am f320e8e5: am ed318bff: Merge "log.h: Fix typo"Andreas Gampe2015-02-111-1/+1
|\ \ \ | |/ /
| * | am ed318bff: Merge "log.h: Fix typo"Andreas Gampe2015-02-101-1/+1
| |\ \ | | |/
| | * log.h: Fix typoAndreas Gampe2015-02-091-1/+1
* | | am 8a5198a1: am fd867303: Merge changes I420b5b8a,Ica23fe41Mark Salyzyn2015-02-111-32/+55
|\ \ \ | |/ /
| * | am fd867303: Merge changes I420b5b8a,Ica23fe41Mark Salyzyn2015-02-101-32/+55
| |\ \ | | |/
| | * log.h: wrap android_testLog around __android_log_is_loggableMark Salyzyn2015-02-091-1/+16
| | * log.h: deprecate CONDITIONMark Salyzyn2015-02-091-31/+39
* | | am 2671ffb6: am 95f7ecbd: Merge "liblog: add __android_log_is_loggable()"Mark Salyzyn2015-02-111-0/+6
|\ \ \ | |/ /
| * | am 95f7ecbd: Merge "liblog: add __android_log_is_loggable()"Mark Salyzyn2015-02-101-0/+6
| |\ \ | | |/
| | * liblog: add __android_log_is_loggable()Mark Salyzyn2015-02-091-0/+6
* | | am e6ed63e6: am c9c401e6: Merge "Move map data into backtrace data proper."Christopher Ferris2015-02-092-8/+15
|\ \ \ | |/ /
| * | am c9c401e6: Merge "Move map data into backtrace data proper."Christopher Ferris2015-02-062-8/+15
| |\ \ | | |/
| | * Merge "Move map data into backtrace data proper."Christopher Ferris2015-02-062-8/+15
| | |\
| | | * Move map data into backtrace data proper.Christopher Ferris2015-02-062-8/+15
* | | | am b164b103: am 5e753100: Merge "Clean up reading and writing in init."Elliott Hughes2015-02-091-0/+3
|\ \ \ \ | |/ / /
| * | | am 5e753100: Merge "Clean up reading and writing in init."Elliott Hughes2015-02-061-0/+3
| |\ \ \ | | |/ /
| | * | Clean up reading and writing in init.Elliott Hughes2015-02-061-0/+3
| | |/
* | | am dcbeb41a: am d558530b: Merge "Fix Windows build."Elliott Hughes2015-02-051-0/+3
|\ \ \ | |/ /
| * | am d558530b: Merge "Fix Windows build."Elliott Hughes2015-02-051-0/+3
| |\ \ | | |/
| | * Fix Windows build.Elliott Hughes2015-02-051-0/+3
* | | Merge "Adding name field to AudioPort for enum/select API."Paul McLean2015-02-051-1/+3
|\ \ \
| * | | Adding name field to AudioPort for enum/select API.Paul McLean2015-02-021-1/+3
* | | | am 44fdd5d1: am 27d28d3b: Merge "Add a WriteStringToFile overload that cares ...Elliott Hughes2015-02-051-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | am 27d28d3b: Merge "Add a WriteStringToFile overload that cares about permiss...Elliott Hughes2015-02-051-0/+3
| |\ \ \ | | | |/ | | |/|
| | * | Add a WriteStringToFile overload that cares about permissions.Elliott Hughes2015-02-041-0/+3
* | | | am 8a2634c2: am 55732f49: Merge "android_reboot should take a const char*."Elliott Hughes2015-02-041-1/+1
|\ \ \ \ | |/ / /
| * | | am 55732f49: Merge "android_reboot should take a const char*."Elliott Hughes2015-02-041-1/+1
| |\ \ \ | | |/ /
| | * | android_reboot should take a const char*.Elliott Hughes2015-02-031-1/+1
* | | | am 14fcc4c6: am e44d25d6: Merge "Add Google-style StringPrintf."Elliott Hughes2015-02-031-0/+38
|\ \ \ \ | |/ / /
| * | | am e44d25d6: Merge "Add Google-style StringPrintf."Elliott Hughes2015-02-031-0/+38
| |\ \ \ | | |/ /
| | * | Merge "Add Google-style StringPrintf."Elliott Hughes2015-02-031-0/+38
| | |\ \
| | | * | Add Google-style StringPrintf.Elliott Hughes2015-02-031-0/+38
* | | | | am c3bf8d85: am 9fc43358: Merge "Extra Win32 compatibility."Elliott Hughes2015-02-031-0/+6
|\ \ \ \ \ | |/ / / /