Merge "Add option for custom battery path" into twrp2.4
diff --git a/Android.mk b/Android.mk
index 57bab35..199aba4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -234,6 +234,9 @@
ifneq ($(TW_MAX_BRIGHTNESS),)
LOCAL_CFLAGS += -DTW_MAX_BRIGHTNESS=$(TW_MAX_BRIGHTNESS)
endif
+ifneq ($(TW_CUSTOM_BATTERY_PATH),)
+ LOCAL_CFLAGS += -DTW_CUSTOM_BATTERY_PATH=$(TW_CUSTOM_BATTERY_PATH)
+endif
ifeq ($(TARGET_BOARD_PLATFORM),rk30xx)
LOCAL_CFLAGS += -DRK3066
endif
diff --git a/data.cpp b/data.cpp
index c517a99..02bdba3 100644
--- a/data.cpp
+++ b/data.cpp
@@ -926,7 +926,13 @@
if (curTime.tv_sec > nextSecCheck)
{
char cap_s[4];
+#ifdef TW_CUSTOM_BATTERY_PATH
+ string capacity_file = EXPAND(TW_CUSTOM_BATTERY_PATH);
+ capacity_file += "/capacity";
+ FILE * cap = fopen(capacity_file.c_str(),"rt");
+#else
FILE * cap = fopen("/sys/class/power_supply/battery/capacity","rt");
+#endif
if (cap){
fgets(cap_s, 4, cap);
fclose(cap);
@@ -934,7 +940,13 @@
if (lastVal > 100) lastVal = 101;
if (lastVal < 0) lastVal = 0;
}
+#ifdef TW_CUSTOM_BATTERY_PATH
+ string status_file = EXPAND(TW_CUSTOM_BATTERY_PATH);
+ status_file += "/status";
+ cap = fopen(status_file.c_str(),"rt");
+#else
cap = fopen("/sys/class/power_supply/battery/status","rt");
+#endif
if (cap) {
fgets(cap_s, 2, cap);
fclose(cap);