platform_system_core/healthd
Luke Song 23471afe84 resolve merge conflicts of 74a5f22d9 to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.

Change-Id: Iad367b2998311e327151dbd8e9295259f6661f77
2017-07-19 18:25:51 -07:00
..
images remove pixelflinger from healthd 2014-03-11 12:25:41 -07:00
include/healthd healthd: move binder fd to not use EPOLLWAKEUP am: e89ea5eb85 2016-10-21 21:53:49 +00:00
tests Allow customization of charger animation 2016-09-12 21:07:27 -07:00
Android.mk healthd: restructure healthd_mode_charger 2017-07-18 15:06:46 -07:00
AnimationParser.cpp Allow customization of charger animation 2016-09-12 21:07:27 -07:00
AnimationParser.h Allow customization of charger animation 2016-09-12 21:07:27 -07:00
BatteryMonitor.cpp Merge "healthd: add battery health status values from JEITA spec" am: 5dd87c4ef6 2017-06-21 19:29:25 +00:00
BatteryPropertiesRegistrar.cpp healthd: notify listeners using local copy of list, drop lock 2017-06-27 11:58:17 -07:00
BatteryPropertiesRegistrar.h healthd: Implement scheduleUpdate 2017-03-22 12:15:11 -07:00
animation.h Allow customization of charger animation 2016-09-12 21:07:27 -07:00
charger.cpp healthd: refactor healthd code to split into 'charger' and 'healthd' 2016-11-08 07:36:07 -08:00
healthd.cpp health HAL uses "default" service name 2017-02-23 19:32:29 +00:00
healthd_common.cpp healthd: refactor healthd code to split into 'charger' and 'healthd' 2016-11-08 07:36:07 -08:00
healthd_draw.cpp healthd: restructure healthd_mode_charger 2017-07-18 15:06:46 -07:00
healthd_draw.h healthd: restructure healthd_mode_charger 2017-07-18 15:06:46 -07:00
healthd_mode_android.cpp healthd: refactor healthd code to split into 'charger' and 'healthd' 2016-11-08 07:36:07 -08:00
healthd_mode_charger.cpp resolve merge conflicts of 74a5f22d9 to oc-dr1-dev-plus-aosp 2017-07-19 18:25:51 -07:00