StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cm: charger: Fix cm healthd

Browse Source 
Change-Id: Ibd8e9470e01d14a11941e47c099d6dd13d5d51cc
This commit is contained in:
Luca Stefani
2016-08-25 14:41:17 +02:00
parent 477913bfa9
commit 7d2b6d238b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
charger/Android.mk
View File

@@ -5,7 +5,7 @@ LOCAL_SRC_FILES := healthd_board_cm.cpp
LOCAL_MODULE := libhealthd.cm LOCAL_MODULE := libhealthd.cm
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := -Werror
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
system/core/healthd \ system/core/healthd/include \
bootable/recovery bootable/recovery
ifneq ($(BACKLIGHT_PATH),) ifneq ($(BACKLIGHT_PATH),)
LOCAL_CFLAGS += -DHEALTHD_BACKLIGHT_PATH=\"$(BACKLIGHT_PATH)\" LOCAL_CFLAGS += -DHEALTHD_BACKLIGHT_PATH=\"$(BACKLIGHT_PATH)\"

6
charger/healthd_board_cm.cpp
View File

@@ -36,7 +36,7 @@
#include <sys/timerfd.h> #include <sys/timerfd.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include "healthd.h" #include "healthd/healthd.h"
#include "minui/minui.h" #include "minui/minui.h"
#define LOGE(x...) do { KLOG_ERROR("charger", x); } while (0) #define LOGE(x...) do { KLOG_ERROR("charger", x); } while (0)
@@ -294,9 +294,11 @@ void healthd_board_init(struct healthd_config*)
char value[PROP_VALUE_MAX]; char value[PROP_VALUE_MAX];
int rc = 0, scale_count = 0, i; int rc = 0, scale_count = 0, i;
GRSurface **scale_frames; GRSurface **scale_frames;
int scale_fps; // Not in use (charger/cm_battery_scale doesn't have FPS text
// chunk). We are using hard-coded frame.disp_time instead.
rc = res_create_multi_display_surface("charger/cm_battery_scale", rc = res_create_multi_display_surface("charger/cm_battery_scale",
&scale_count, &scale_frames); &scale_fps, &scale_count, &scale_frames);
if (rc < 0) { if (rc < 0) {
LOGE("%s: Unable to load battery scale image", __func__); LOGE("%s: Unable to load battery scale image", __func__);
return; return;