diff options
| author | 2016-08-16 00:21:34 +0000 | |
|---|---|---|
| committer | 2016-08-16 00:21:35 +0000 | |
| commit | f5e51cf7a9417e1c06dbbb9547020c20ff7517f8 (patch) | |
| tree | 52054d6df42192e1cdebc8386d1a3ba00ae1534b | |
| parent | ab35493046263e76543b43856dececeb61532483 (diff) | |
| parent | cafdc2e50da6bd3ea3fc3f25e1603fc321903c75 (diff) | |
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev
| -rw-r--r-- | services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java index 7525e87c0e12..6b273210263d 100644 --- a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java +++ b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java @@ -89,8 +89,8 @@ public class RetailDemoModeService extends SystemService { private static final long SCREEN_WAKEUP_DELAY = 2500; private static final long USER_INACTIVITY_TIMEOUT_MIN = 10000; - private static final long USER_INACTIVITY_TIMEOUT_DEFAULT = 30000; - private static final long WARNING_DIALOG_TIMEOUT_DEFAULT = 6000; + private static final long USER_INACTIVITY_TIMEOUT_DEFAULT = 90000; + private static final long WARNING_DIALOG_TIMEOUT_DEFAULT = 0; private static final long MILLIS_PER_SECOND = 1000; private static final int[] VOLUME_STREAMS_TO_MUTE = { |