Kindle: Log the args from WakeupFromSuspend & ReadyToSuspend

frontend/device/kindle/device.lua

@@ -376,14 +376,16 @@ function Kindle:usbPlugOut()
     -- NOTE: See usbPlugIn(), we don't have anything fancy to do here either.
 end
 
-function Kindle:wakeupFromSuspend()
+function Kindle:wakeupFromSuspend(ts)
-    self.powerd:wakeupFromSuspend()
+    logger.dbg("Kindle:wakeupFromSuspend", ts)
+    self.powerd:wakeupFromSuspend(ts)
     self.last_suspend_time = time.boottime_or_realtime_coarse() - self.suspend_time
     self.total_suspend_time = self.total_suspend_time + self.last_suspend_time
 end
 
-function Kindle:readyToSuspend()
+function Kindle:readyToSuspend(delay)
-    self.powerd:readyToSuspend()
+    logger.dbg("Kindle:readyToSuspend", delay)
+    self.powerd:readyToSuspend(delay)
     self.suspend_time = time.boottime_or_realtime_coarse()
 end
 
@@ -400,6 +402,8 @@ function Kindle:setEventHandlers(uimgr)
     -- These custom fake events *will* pass an argument...
     self.input.fake_event_args.IntoSS = {}
     self.input.fake_event_args.OutOfSS = {}
+    self.input.fake_event_args.WakeupFromSuspend = {}
+    self.input.fake_event_args.ReadyToSuspend = {}
 
     UIManager.event_handlers.Suspend = function()
         self.powerd:toggleSuspend()
@@ -424,11 +428,13 @@ function Kindle:setEventHandlers(uimgr)
         self:usbPlugOut()
         self:_afterNotCharging()
     end
-    UIManager.event_handlers.WakeupFromSuspend = function()
+    UIManager.event_handlers.WakeupFromSuspend = function(input_event)
-        self:wakeupFromSuspend()
+        local arg = table.remove(self.input.fake_event_args[input_event])
+        self:wakeupFromSuspend(arg)
     end
-    UIManager.event_handlers.ReadyToSuspend = function()
+    UIManager.event_handlers.ReadyToSuspend = function(input_event)
-        self:readyToSuspend()
+        local arg = table.remove(self.input.fake_event_args[input_event])
+        self:readyToSuspend(arg)
     end
 end
 

frontend/device/kindle/powerd.lua

@@ -243,8 +243,7 @@ function KindlePowerD:initWakeupMgr()
     if not self.device:supportsScreensaver() then return end
     if self.lipc_handle == nil then return end
 
-    function KindlePowerD:wakeupFromSuspend()
+    function KindlePowerD:wakeupFromSuspend(ts)
-        logger.dbg("Kindle wakeupFromSuspend")
         -- Give the device a few seconds to settle.
         -- This filters out user input resumes -> device will resume to active
         -- Also the Kindle stays in Ready to suspend for 10 seconds
@@ -252,8 +251,7 @@ function KindlePowerD:initWakeupMgr()
         UIManager:scheduleIn(15, self.checkUnexpectedWakeup, self)
     end
 
-    function KindlePowerD:readyToSuspend()
+    function KindlePowerD:readyToSuspend(delay)
-        logger.dbg("Kindle readyToSuspend")
         if self.device.wakeup_mgr:isWakeupAlarmScheduled() then
             local now = os.time()
             local alarm = self.device.wakeup_mgr:getWakeupAlarmEpoch()