summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Suprabh Shukla <suprabh@google.com> 2016-08-16 00:56:43 +0000
committer android-build-merger <android-build-merger@google.com> 2016-08-16 00:56:43 +0000
commitc32b08da9d2a464c373bb217170e51a333a587f4 (patch)
treefa3da4117c4ef4978f778ba7a88a34dfb03207d9
parent0f513637d2bf8c58bf8e91e8ee2cee02e9d5a957 (diff)
parent925a30e82be4b7af257d0b3df012f026201272b6 (diff)
Changing user inactivity and warning dialog timeouts am: cafdc2e50d
am: 925a30e82b Change-Id: Ia999e7deec13087cb0084b21b737fbff7aaf0bf4
-rw-r--r--services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java4
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 = {