diff options
| author | Nick Vaccaro <nvaccaro@google.com> | 2016-10-24 13:52:17 -0700 |
|---|---|---|
| committer | Nick Vaccaro <nvaccaro@google.com> | 2016-10-24 14:07:35 -0700 |
| commit | e204690ae7521726711b3b16f29c5e52a980ebb3 (patch) | |
| tree | 38e4fe79f1702802613795c8b3061967d5751133 /healthd | |
| parent | 5115f1c77a51837776ab52a8e86d2583081ba17a (diff) | |
| parent | 7c5aeb0f0ae44b02c3abc72e1daa4151940e1937 (diff) | |
| download | system_core-e204690ae7521726711b3b16f29c5e52a980ebb3.tar.gz system_core-e204690ae7521726711b3b16f29c5e52a980ebb3.tar.bz2 system_core-e204690ae7521726711b3b16f29c5e52a980ebb3.zip | |
resolve merge conflicts of 7c5aeb0 to nyc-mr2-dev-plus-aosp
Test: make healthd
Change-Id: I6dd20f5da5d2a9858d49db5556d8956a67ebf962
Diffstat (limited to 'healthd')
| -rw-r--r-- | healthd/Android.mk | 8 | ||||
| -rw-r--r-- | healthd/healthd.cpp | 16 |
2 files changed, 21 insertions, 3 deletions
diff --git a/healthd/Android.mk b/healthd/Android.mk index 7c5e35bac..1c130dc1b 100644 --- a/healthd/Android.mk +++ b/healthd/Android.mk @@ -90,6 +90,14 @@ endif LOCAL_C_INCLUDES := bootable/recovery $(LOCAL_PATH)/include +ifneq ($(BOARD_PERIODIC_CHORES_INTERVAL_FAST),) +LOCAL_CFLAGS += -DBOARD_PERIODIC_CHORES_INTERVAL_FAST=$(BOARD_PERIODIC_CHORES_INTERVAL_FAST) +endif + +ifneq ($(BOARD_PERIODIC_CHORES_INTERVAL_SLOW),) +LOCAL_CFLAGS += -DBOARD_PERIODIC_CHORES_INTERVAL_SLOW=$(BOARD_PERIODIC_CHORES_INTERVAL_SLOW) +endif + LOCAL_STATIC_LIBRARIES := \ libhealthd_internal \ libbatterymonitor \ diff --git a/healthd/healthd.cpp b/healthd/healthd.cpp index 97ed51df5..3f0e047cf 100644 --- a/healthd/healthd.cpp +++ b/healthd/healthd.cpp @@ -35,9 +35,19 @@ using namespace android; -// Periodic chores intervals in seconds -#define DEFAULT_PERIODIC_CHORES_INTERVAL_FAST (60 * 1) -#define DEFAULT_PERIODIC_CHORES_INTERVAL_SLOW (60 * 10) +#ifndef BOARD_PERIODIC_CHORES_INTERVAL_FAST + // Periodic chores fast interval in seconds + #define DEFAULT_PERIODIC_CHORES_INTERVAL_FAST (60 * 1) +#else + #define DEFAULT_PERIODIC_CHORES_INTERVAL_FAST (BOARD_PERIODIC_CHORES_INTERVAL_FAST) +#endif + +#ifndef BOARD_PERIODIC_CHORES_INTERVAL_SLOW + // Periodic chores fast interval in seconds + #define DEFAULT_PERIODIC_CHORES_INTERVAL_SLOW (60 * 10) +#else + #define DEFAULT_PERIODIC_CHORES_INTERVAL_SLOW (BOARD_PERIODIC_CHORES_INTERVAL_SLOW) +#endif static struct healthd_config healthd_config = { .periodic_chores_interval_fast = DEFAULT_PERIODIC_CHORES_INTERVAL_FAST, |