summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* libutils: String\d+ make std_string privateSteven Moreland2017-03-111-1/+1
* healthd: Track the API change of minui/minui.h.Tao Bao2017-01-191-8/+10
* 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
|\| | |
| * | | Merge "Fix misc-macro-parentheses warnings in system/core."Treehugger Robot2016-06-221-1/+1
| |\ \ \
| | * | | Fix misc-macro-parentheses warnings in system/core.Chih-Hung Hsieh2016-06-221-1/+1
* | | | | resolve merge conflicts of a617e33 to stage-aosp-masterDmitry Shmidt2016-06-203-95/+68
|\| | | |
| * | | | batterymonitor: simplify readFromFile and use std::string buffersMichael Scott2016-06-203-83/+57
| |/ / /
* | | | Merge "Export libbinder headers from libhealhd.default" am: c2241b9Christopher Wiley2016-04-181-0/+1
|\| | |
| * | | Export libbinder headers from libhealhd.defaultChristopher Wiley2016-04-181-0/+1
* | | | Merge "healthd: Explicitly reference headers from libbinder" am: 911982dTreehugger Robot2016-04-121-1/+2
|\| | |
| * | | healthd: Explicitly reference headers from libbinderChristopher Wiley2016-04-121-1/+2
* | | | healthd: Add charge counter for BatteryProperties.Ruchi Kandoi2016-04-071-0/+4
|\ \ \ \ | | |/ / | |/| |
| * | | healthd: Add charge counter for BatteryProperties.Ruchi Kandoi2016-04-071-0/+4
* | | | Merge "healthd: Check if battery device exists instead of charger drivers bef...Ruchi Kandoi2016-03-081-7/+3
|\ \ \ \ | | |/ / | |/| |
| * | | healthd: Check if battery device exists instead of charger drivers beforeRuchi Kandoi2016-03-081-7/+3
* | | | Merge "healthd: Correct the scaling factor for maxVoltage and maxCurrent." in...Ruchi Kandoi2016-02-261-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | healthd: Correct the scaling factor for maxVoltage and maxCurrent.Ruchi Kandoi2016-02-261-1/+1
* | | | Merge "healthd: Read the max power supply voltage" into nyc-devBadhri Jagan Sridharan2016-02-251-7/+24
|\| | |
| * | | healthd: Read the max power supply voltageBadhri Jagan Sridharan2016-02-251-7/+24
| * | | healthd: support reading charge status from BatteryMonitor.Yabin Cui2016-02-232-0/+12
| * | | healthd: separate libbatterymonitor for use in recovery.Yabin Cui2016-02-239-11/+20
| * | | healthd: init members of BatteryMonitor.Yabin Cui2016-02-232-6/+24
* | | | Merge "healthd: Remove warning by clang compiler." am: 08c8b53800Ruchi Kandoi2016-02-231-2/+1
|\ \ \ \ | | |/ / | |/| |
| * | | healthd: Remove warning by clang compiler.Ruchi Kandoi2016-02-221-2/+1
* | | | Merge "healthd: support reading charge status from BatteryMonitor." am: d6331...Yabin Cui2016-02-222-0/+12
|\| | |
| * | | healthd: support reading charge status from BatteryMonitor.Yabin Cui2016-02-192-0/+12
* | | | resolve merge conflicts of 0f5d443d0c to nyc-dev-plus-aospJames Hawkins2016-02-191-3/+3
|\| | |
| * | | Merge "system/core: Cleanup direct calls to opendir by containing in a std::u...James Hawkins2016-02-191-3/+3
| |\ \ \
| | * | | system/core: Cleanup direct calls to opendir by containing in aJames Hawkins2016-02-181-3/+3
* | | | | Merge "healthd: separate libbatterymonitor for use in recovery." am: 219806bc7aYabin Cui2016-02-199-12/+21
|\| | | |
| * | | | healthd: separate libbatterymonitor for use in recovery.Yabin Cui2016-02-199-12/+21
| |/ / /
* | | | Merge "healthd: Add "No UI" operation for charger mode" am: fdd26c961dTodd Poynor2016-02-172-2/+31
|\| | |
| * | | healthd: Add "No UI" operation for charger modeTodd Poynor2016-02-172-2/+31
* | | | Merge "healthd: init members of BatteryMonitor."Yabin Cui2016-02-172-6/+24
|\| | | | |/ / |/| |
| * | healthd: init members of BatteryMonitor.Yabin Cui2016-02-162-6/+24
* | | Merge "Add support for USB_HVDCP chargers" am: ba3014c914Elliott Hughes2016-02-031-1/+4
|\| |
| * | Add support for USB_HVDCP chargersJohan Redestig2016-02-031-1/+4
* | | Merge "healthd: BatteryPropertiesRegistrar binder service ref count fixup" am...Todd Poynor2016-01-283-4/+5
|\| |
| * | healthd: BatteryPropertiesRegistrar binder service ref count fixupTodd Poynor2016-01-283-4/+5
* | | Merge "logd: isMonotonic improvements" am: 554630f94eMark Salyzyn2015-12-301-20/+0
|\| |