From 8f61bc750b5f7abec12f0ec123fd8e71694a460e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Fern=C3=A1ndez?= Date: Wed, 9 Sep 2020 17:58:44 +0200 Subject: [PATCH] AndroidPowerD: remove unneded syntactic sugar & JNI calls (#6641) Each JNI call has a little overhead, so don't use them when it is not needed. The syntactic sugar is not needed to use android module's functions. --- frontend/device/android/powerd.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/frontend/device/android/powerd.lua b/frontend/device/android/powerd.lua index 34500f660..4a6c326b1 100644 --- a/frontend/device/android/powerd.lua +++ b/frontend/device/android/powerd.lua @@ -21,27 +21,28 @@ end function AndroidPowerD:setIntensityHW(intensity) -- if frontlight switch was toggled of, turn it on - android:enableFrontlightSwitch() + android.enableFrontlightSwitch() self.fl_intensity = intensity android.setScreenBrightness(math.floor(intensity * self.bright_diff / self.fl_max)) end function AndroidPowerD:init() - self.bright_diff = android:getScreenMaxBrightness() - android:getScreenMinBrightness() + local min_bright = android.getScreenMinBrightness() + self.bright_diff = android.getScreenMaxBrightness() - min_bright -- if necessary scale fl_min: -- do not use fl_min==0 if getScreenMinBrightness!=0, -- because intenstiy==0 would mean to use system intensity - if android:getScreenMinBrightness() ~= self.fl_min then - self.fl_min = math.ceil(android:getScreenMinBrightness() * self.bright_diff / self.fl_max) + if min_bright ~= self.fl_min then + self.fl_min = math.ceil(min_bright * self.bright_diff / self.fl_max) end if self.device:hasNaturalLight() then - self.warm_diff = android:getScreenMaxWarmth() - android:getScreenMinWarmth() self.fl_warmth = self:getWarmth() - self.fl_warmth_min = android:getScreenMinWarmth() - self.fl_warmth_max = android:getScreenMaxWarmth() + self.fl_warmth_min = android.getScreenMinWarmth() + self.fl_warmth_max = android.getScreenMaxWarmth() + self.warm_diff = self.fl_warmth_max - self.fl_warmth_min end end