diff options
| author | Dees Troy <dees_troy@teamw.in> | 2013-03-12 03:35:23 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@5.9.244.119> | 2013-03-12 03:35:23 +0100 |
| commit | 4771e0130a5adac0c522a4c26aba398650a8a58e (patch) | |
| tree | 3e364bd99e8f017ab86f4444da0d3d02037c7154 | |
| parent | Merge "Remove unused fonts from 320x480" into twrp2.4 (diff) | |
| parent | add no fb blanking (diff) | |
| download | android_bootable_recovery-4771e0130a5adac0c522a4c26aba398650a8a58e.tar android_bootable_recovery-4771e0130a5adac0c522a4c26aba398650a8a58e.tar.gz android_bootable_recovery-4771e0130a5adac0c522a4c26aba398650a8a58e.tar.bz2 android_bootable_recovery-4771e0130a5adac0c522a4c26aba398650a8a58e.tar.lz android_bootable_recovery-4771e0130a5adac0c522a4c26aba398650a8a58e.tar.xz android_bootable_recovery-4771e0130a5adac0c522a4c26aba398650a8a58e.tar.zst android_bootable_recovery-4771e0130a5adac0c522a4c26aba398650a8a58e.zip | |
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | gui/Android.mk | 3 | ||||
| -rw-r--r-- | gui/blanktimer.cpp | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 72fa98c28..0419e827f 100644 --- a/Android.mk +++ b/Android.mk @@ -187,6 +187,9 @@ endif ifeq ($(TW_HAS_DOWNLOAD_MODE), true) LOCAL_CFLAGS += -DTW_HAS_DOWNLOAD_MODE endif +ifeq ($(TW_NO_SCREEN_BLANK), true) + LOCAL_CFLAGS += -DTW_NO_SCREEN_BLANK +endif ifeq ($(TW_SDEXT_NO_EXT4), true) LOCAL_CFLAGS += -DTW_SDEXT_NO_EXT4 endif 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(); |