Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e204690a authored by Nick Vaccaro's avatar Nick Vaccaro
Browse files

resolve merge conflicts of 7c5aeb0f to nyc-mr2-dev-plus-aosp 

Test: make healthd
Change-Id: I6dd20f5da5d2a9858d49db5556d8956a67ebf962
parents 5115f1c7 7c5aeb0f

healthd/Android.mk

+8 −0
Original line number Diff line number Diff line
@@ -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 \

healthd/healthd.cpp

+13 −3
Original line number Diff line number Diff line
@@ -35,9 +35,19 @@ 


using namespace android;



// Periodic chores intervals in seconds

#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,