summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* healthd: Fix negativity check after cast to unsigned enumYi Kong2018-03-021-3/+3
* healthd: don't report fake data for battery-less devicesTodd Poynor2018-02-051-20/+6
* Merge "healthd: add battery health status values from JEITA spec" am: 5dd87c4ef6Yueyao Zhu2017-06-211-0/+4
|\
| * healthd: add battery health status values from JEITA specYueyao Zhu2017-06-201-0/+4
* | Merge "libutils: String\d+ make std_string private" am: 76850afa52 am: 2ebb1e...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
* | | healthd: return battery status propertyJin Qian2017-02-071-0/+10
|/ /
* / Add BMS as a Battery typeAdam Lesinski2016-12-091-0/+1
|/
* Move off std::sto* function which abort on failure.Elliott Hughes2016-10-131-1/+2
* resolve merge conflicts of a617e33 to stage-aosp-masterDmitry Shmidt2016-06-201-92/+65
|\
| * batterymonitor: simplify readFromFile and use std::string buffersMichael Scott2016-06-201-80/+54
* | 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-231-0/+11
| * | healthd: separate libbatterymonitor for use in recovery.Yabin Cui2016-02-231-2/+2
| * | healthd: init members of BatteryMonitor.Yabin Cui2016-02-231-6/+23
* | | 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-221-0/+11
|\| |
| * | healthd: support reading charge status from BatteryMonitor.Yabin Cui2016-02-191-0/+11
* | | 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-191-2/+2
|\| | |
| * | | healthd: separate libbatterymonitor for use in recovery.Yabin Cui2016-02-191-2/+2
| |/ /
* | / Merge "healthd: init members of BatteryMonitor."Yabin Cui2016-02-171-6/+23
|\| | | |/ |/|
| * healthd: init members of BatteryMonitor.Yabin Cui2016-02-161-6/+23
* | 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 "logd: isMonotonic improvements" am: 554630f94eMark Salyzyn2015-12-301-20/+0
|\|
| * logd: isMonotonic improvementsMark Salyzyn2015-12-291-20/+0
* | Merge remote-tracking branch \'origin/mnc-dr2-dev\' into mnc-dr2-dev-plus-aospQiwen Zhao2015-11-191-24/+7
|\|
* | Merge "healthd: Support new PD and USB Type C types" am: ab75edb4ad am: 741df...Ruchi Kandoi2015-11-131-0/+3
|\|
| * Merge "healthd: Support new PD and USB Type C types"Ruchi Kandoi2015-11-131-0/+3
| |\
| | * healthd: Support new PD and USB Type C typesBenson Leung2015-11-121-0/+3
| * | am 43ed8e15: am 08cf0e55: Merge "healthd: Adds fake battery properties for de...Ruchi Kandoi2015-10-121-1/+18
| |\ \ | | |/ | |/|
| | * healthd: Adds fake battery properties for devices with no battery.Ruchi Kandoi2015-10-121-1/+18
| | * healthd: logd: add timestamp to kernel logged battery messagesMark Salyzyn2015-08-271-5/+29
* | | healthd: Read the max power supply voltageBadhri Jagan Sridharan2015-11-021-7/+24
* | | Adding comment removed from failed merge (6acb240c)Ian Pedowitz2015-10-121-0/+3
* | | healthd: Adds fake battery properties for devices with no battery.Ruchi Kandoi2015-10-091-2/+16
|/ /
* | am 62729a1d: am 565e4c6a: Merge "healthd: Adds cycle_count, current_now and f...Ruchi Kandoi2015-08-251-6/+60
|\ \