summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorbigbiff bigbiff <bigbiff@teamw.in>2013-03-09 15:58:50 +0100
committerbigbiff bigbiff <bigbiff@teamw.in>2013-03-11 23:45:06 +0100
commit8794036ba3ed47e82340ea43ebec3901274e764a (patch)
treea0e63ba1a1d19e4cccc78928ce0ba84eba6eef7e /gui
parentuse md5.c for computation of md5sums (diff)
downloadandroid_bootable_recovery-8794036ba3ed47e82340ea43ebec3901274e764a.tar
android_bootable_recovery-8794036ba3ed47e82340ea43ebec3901274e764a.tar.gz
android_bootable_recovery-8794036ba3ed47e82340ea43ebec3901274e764a.tar.bz2
android_bootable_recovery-8794036ba3ed47e82340ea43ebec3901274e764a.tar.lz
android_bootable_recovery-8794036ba3ed47e82340ea43ebec3901274e764a.tar.xz
android_bootable_recovery-8794036ba3ed47e82340ea43ebec3901274e764a.tar.zst
android_bootable_recovery-8794036ba3ed47e82340ea43ebec3901274e764a.zip
Diffstat (limited to '')
-rw-r--r--gui/Android.mk3
-rw-r--r--gui/blanktimer.cpp4
2 files changed, 7 insertions, 0 deletions
diff --git a/gui/Android.mk b/gui/Android.mk
index 9e11e5e2d..de1460443 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -51,6 +51,9 @@ endif
ifneq ($(TW_BRIGHTNESS_PATH),)
LOCAL_CFLAGS += -DTW_BRIGHTNESS_PATH=$(TW_BRIGHTNESS_PATH)
endif
+ifneq ($(TW_NO_SCREEN_BLANK),)
+ LOCAL_CFLAGS += -DTW_NO_SCREEN_BLANK
+endif
LOCAL_C_INCLUDES += bionic external/stlport/stlport $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION)
diff --git a/gui/blanktimer.cpp b/gui/blanktimer.cpp
index d7a6ffffc..7085557e8 100644
--- a/gui/blanktimer.cpp
+++ b/gui/blanktimer.cpp
@@ -95,9 +95,11 @@ int blanktimer::setClockTimer(void) {
setBrightness(0);
PageManager::ChangeOverlay("lock");
}
+#ifndef TW_NO_SCREEN_BLANK
if (conblank == 2 && gr_fb_blank(1) >= 0) {
setConBlank(3);
}
+#endif
}
return -1; //shouldn't get here
}
@@ -126,10 +128,12 @@ void blanktimer::resetTimerAndUnblank(void) {
setTimer();
switch (conblank) {
case 3:
+#ifndef TW_NO_SCREEN_BLANK
if (gr_fb_blank(0) < 0) {
LOGI("blanktimer::resetTimerAndUnblank failed to gr_fb_blank(0)\n");
break;
}
+#endif
// No break here, we want to keep going
case 2:
gui_forceRender();