From a8658a7e8ad100e96ab5ddf56b7fbb0afc37a36e Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 20 Mar 2016 23:37:14 -0700 Subject: [PATCH 1/2] fix(credocument): bump base to fix empty text search crash --- base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base b/base index b4b578c0b..aee39bc8c 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit b4b578c0b9f2108231af33acb6534c526daab9ed +Subproject commit aee39bc8c452a56ee08c39d37a631e897c34b2ec From c35aad3ae1aac3a8e4c339dfa04aaaad651d7c4c Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 20 Mar 2016 23:58:59 -0700 Subject: [PATCH 2/2] fix(kobo): return 0 frontlight level config to signal frontlight off state --- frontend/device/kobo/nickel_conf.lua | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/frontend/device/kobo/nickel_conf.lua b/frontend/device/kobo/nickel_conf.lua index 2cfcceb05..c200617a4 100644 --- a/frontend/device/kobo/nickel_conf.lua +++ b/frontend/device/kobo/nickel_conf.lua @@ -49,14 +49,12 @@ end function NickelConf.frontLightLevel.get() local new_intensity = NickelConf._read_kobo_conf(re_FrontLightLevel) if new_intensity then - new_intensity = tonumber(new_intensity) - end - - -- In NickelConfSpec, require("device") won't return KoboDevice - local powerd = require("device/kobo/powerd") - if new_intensity then - return powerd:normalizeIntensity(new_intensity) + -- we need 0 to signal frontlight off for device that does not support + -- FrontLightState config, so don't normalize the value here yet. + return tonumber(new_intensity) else + -- In NickelConfSpec, require("device") won't return KoboDevice + local powerd = require("device/kobo/powerd") local fallback_fl_level = powerd.fl_intensity or 1 assert(NickelConf.frontLightLevel.set(fallback_fl_level)) return fallback_fl_level