diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2014-04-16 20:30:45 +0200 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2014-04-16 20:30:57 +0200 |
| commit | fc966505e518ba690e654dd5b397f74915571cc8 (patch) | |
| tree | 11614b08e67d0f258f6f401db1fe559f17ba8bf4 | |
| parent | Fix handling of storage with data/media vs data/media/0 (diff) | |
| download | android_bootable_recovery-fc966505e518ba690e654dd5b397f74915571cc8.tar android_bootable_recovery-fc966505e518ba690e654dd5b397f74915571cc8.tar.gz android_bootable_recovery-fc966505e518ba690e654dd5b397f74915571cc8.tar.bz2 android_bootable_recovery-fc966505e518ba690e654dd5b397f74915571cc8.tar.lz android_bootable_recovery-fc966505e518ba690e654dd5b397f74915571cc8.tar.xz android_bootable_recovery-fc966505e518ba690e654dd5b397f74915571cc8.tar.zst android_bootable_recovery-fc966505e518ba690e654dd5b397f74915571cc8.zip | |
| -rw-r--r-- | gui/Android.mk | 8 | ||||
| -rw-r--r-- | gui/blanktimer.cpp | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/gui/Android.mk b/gui/Android.mk index 4ad558a01..0f20f16bf 100644 --- a/gui/Android.mk +++ b/gui/Android.mk @@ -51,14 +51,6 @@ endif ifneq ($(TW_EXTERNAL_STORAGE_PATH),) LOCAL_CFLAGS += -DTW_EXTERNAL_STORAGE_PATH=$(TW_EXTERNAL_STORAGE_PATH) endif -ifneq ($(TW_BRIGHTNESS_PATH),) - LOCAL_CFLAGS += -DTW_BRIGHTNESS_PATH=$(TW_BRIGHTNESS_PATH) -endif -ifneq ($(TW_MAX_BRIGHTNESS),) - LOCAL_CFLAGS += -DTW_MAX_BRIGHTNESS=$(TW_MAX_BRIGHTNESS) -else - LOCAL_CFLAGS += -DTW_MAX_BRIGHTNESS=255 -endif ifneq ($(TW_NO_SCREEN_BLANK),) LOCAL_CFLAGS += -DTW_NO_SCREEN_BLANK endif diff --git a/gui/blanktimer.cpp b/gui/blanktimer.cpp index c8d1bcc28..383b15724 100644 --- a/gui/blanktimer.cpp +++ b/gui/blanktimer.cpp @@ -117,7 +117,8 @@ int blanktimer::setClockTimer(void) { int blanktimer::getBrightness(void) { string results; - string brightness_path = EXPAND(TW_BRIGHTNESS_PATH); + string brightness_path; + DataManager::GetValue("tw_brightness_file", brightness_path); if ((TWFunc::read_file(brightness_path, results)) != 0) return -1; int result = atoi(results.c_str()); @@ -135,9 +136,10 @@ int blanktimer::getBrightness(void) { } int blanktimer::setBrightness(int brightness) { - string brightness_path = EXPAND(TW_BRIGHTNESS_PATH); + string brightness_path; string bstring; char buff[100]; + DataManager::GetValue("tw_brightness_file", brightness_path); sprintf(buff, "%d", brightness); bstring = buff; if ((TWFunc::write_file(brightness_path, bstring)) != 0) |