summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "healthd: Implement scheduleUpdate" am: 6edabc75ab am: c0405200b8Adam Lesinski2017-03-222-0/+5
|\
| * Merge "healthd: Implement scheduleUpdate"Adam Lesinski2017-03-222-0/+5
| |\
| | * healthd: Implement scheduleUpdateAdam Lesinski2017-03-222-0/+5
* | | Merge "libutils: String\d+ make std_string private" am: 76850afa52 am: 2ebb1e...Steven Moreland2017-03-111-1/+1
|\| |
| * | Merge "libutils: String\d+ make std_string private"Steven Moreland2017-03-111-1/+1
| |\|
| | * libutils: String\d+ make std_string privateSteven Moreland2017-03-111-1/+1
* | | Merge "Revert "Add BMS as a Battery type""TreeHugger Robot2017-03-061-1/+0
|\ \ \
| * | | Revert "Add BMS as a Battery type"Yueyao Zhu2017-03-061-1/+0
* | | | health HAL uses "default" service nameChris Phoenix2017-02-231-1/+1
* | | | healthd: return battery status propertyJin Qian2017-02-071-0/+10
* | | | healthd: charger mode use reboot(), not android_reboot()Todd Poynor2017-02-011-3/+3
* | | | Merge "healthd: Track the API change of minui/minui.h." am: fb8c70cf4b am: 93...Tao Bao2017-01-241-8/+10
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge "healthd: Track the API change of minui/minui.h." am: fb8c70cf4bTao Bao2017-01-241-8/+10
| |\|
| | * healthd: Track the API change of minui/minui.h.Tao Bao2017-01-191-8/+10
| * | healthd: Show animation before waiting on timerNick Vaccaro2016-11-291-6/+7
| |\ \
| * \ \ resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aospNick Vaccaro2016-11-291-0/+4
| |\ \ \
| * \ \ \ Always show the battery percentage unless it is unknownDamien Bargiacchi2016-11-291-2/+7
| |\ \ \ \
| * \ \ \ \ resolve merge conflicts of 1f1a6fd to nyc-mr1-dev-plus-aospNick Vaccaro2016-11-282-3/+21
| |\ \ \ \ \
* | | | | | | Add BMS as a Battery typeAdam Lesinski2016-12-091-0/+1
* | | | | | | Split libhidl into base and transport.Yifan Hong2016-11-171-1/+2
* | | | | | | healthd: start using the new Health halSandeep Patil2016-11-103-41/+75
* | | | | | | healthd: refactor healthd code to split into 'charger' and 'healthd'Sandeep Patil2016-11-085-351/+420
* | | | | | | healthd: build 'charger' and 'healthd' binariesSandeep Patil2016-11-081-4/+43
* | | | | | | healthd: refactor to split charger and framework facing codeSandeep Patil2016-11-081-45/+48
* | | | | | | healthd: Show animation before waiting on timer am: 6f8314900fNick Vaccaro2016-10-261-6/+7
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | healthd: Show animation before waiting on timerNick Vaccaro2016-10-261-6/+7
| * | | | | | Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-devTreeHugger Robot2016-10-241-1/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge "Always show the battery percentage unless it is unknown" into cw-f-devTreeHugger Robot2016-10-241-2/+7
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | |
* | | | | | resolve merge conflicts of 4897bb5 to nyc-mr2-dev-plus-aospTom Cherry2016-10-251-0/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Enable CHARGER_ENABLE_SUSPEND to allow suspendNick Vaccaro2016-10-241-1/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Enable CHARGER_ENABLE_SUSPEND to allow suspendNick Vaccaro2016-10-241-1/+4
| | |/ / / /
* | | | | | Always show the battery percentage unless it is unknown am: 3f0250c3ccDamien Bargiacchi2016-10-241-2/+7
|\| | | | |
| * | | | | Always show the battery percentage unless it is unknownDamien Bargiacchi2016-10-241-2/+7
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Always show the battery percentage unless it is unknownDamien Bargiacchi2016-10-241-2/+7
* | | | | resolve merge conflicts of 7c5aeb0 to nyc-mr2-dev-plus-aospNick Vaccaro2016-10-242-3/+21
|\| | | | | |_|/ / |/| | |
| * | | healthd: allow override of wake interval timingNick Vaccaro2016-10-212-3/+21
* | | | healthd: move binder fd to not use EPOLLWAKEUP am: e89ea5eb85Tim Murray2016-10-213-7/+15
|\| | | | |_|/ |/| |
| * | healthd: move binder fd to not use EPOLLWAKEUPTim Murray2016-10-213-7/+15
| |\ \ | | |/ | |/|
| | * healthd: move binder fd to not use EPOLLWAKEUPTim Murray2016-10-213-7/+15
* | | resolve merge conflicts of a4398c1 to stage-aosp-master am: 195669febcElliott Hughes2016-10-131-1/+2
|\ \ \
| * | | Move off std::sto* function which abort on failure.Elliott Hughes2016-10-131-1/+2
* | | | resolve merge conflicts of 565ba02 to nyc-mr1-dev-plus-aospDamien Bargiacchi2016-09-137-100/+760
|\ \ \ \ | | |/ / | |/| |
| * | | Allow customization of charger animationDamien Bargiacchi2016-09-127-101/+756
* | | | Update to new minui text APIDamien Bargiacchi2016-08-241-3/+3
|\| | | | |/ / |/| |
| * | Update to new minui text APIDamien Bargiacchi2016-08-181-3/+3
| |/
| * healthd: Check if battery device exists instead of charger drivers before set...Ruchi Kandoi2016-05-171-7/+3
| |\
| | * healthd: Check if battery device exists instead of charger drivers beforeRuchi Kandoi2016-05-161-7/+3
* | | Merge \"Fix clang-tidy performance warnings in healthd.\"Chih-Hung Hsieh2016-07-282-2/+2
|\ \ \
| * | | Fix clang-tidy performance warnings in healthd.Chih-Hung Hsieh2016-07-272-2/+2
* | | | Merge \"Fix misc-macro-parentheses warnings in system/core.\"Chih-Hung Hsieh2016-06-221-1/+1
|\| | |