commit a9e855cd0ce9104c087b748c68c67c2621ae2072
author Jianhong Jiang <jianhong@google.com> Thu Nov 19 21:23:37 2009 -0800
committer Dave Sparks <davidsparks@android.com> Fri Nov 20 15:29:45 2009 -0800
tree 25dff1733d6b70c9528a613a83b8d30b0787d797
parent d4513f10c87aecd60e8245a971c2d0b954c9e9af

RIO-8067: set player engine watchdog timer lower bound to 1 sec. DO NOT MERGE.

engines/player/src/pv_player_engine.h

diff --git a/engines/player/src/pv_player_engine.h b/engines/player/src/pv_player_engine.h
index 77df355..a8a6d6c 100644
--- a/engines/player/src/pv_player_engine.h
+++ b/engines/player/src/pv_player_engine.h
@@ -1624,14 +1624,7 @@
         void setTimerDuration(uint32 aTimerDuration)
         {
             Cancel();
-            if (aTimerDuration == 0)
-            {
-                iTimerDuration = PVPLAYERENGINE_DEFAULT_WATCHDOGTIMER_INTERVAL;
-            }
-            else
-            {
-                iTimerDuration = aTimerDuration;
-            }
+            iTimerDuration = (PVPLAYERENGINE_DEFAULT_WATCHDOGTIMER_INTERVAL < aTimerDuration) ? aTimerDuration : PVPLAYERENGINE_DEFAULT_WATCHDOGTIMER_INTERVAL;
         }
 
         uint32 getTimerDurationInMS()