diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
old mode 100644
new mode 100755
index 3d75785..345edab
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1883,7 +1883,7 @@
<bool name="config_dreamsSupported">true</bool>
<!-- If supported, are dreams enabled? (by default) -->
- <bool name="config_dreamsEnabledByDefault">true</bool>
+ <bool name="config_dreamsEnabledByDefault">false</bool>
<!-- If supported and enabled, are dreams activated when docked? (by default) -->
<bool name="config_dreamsActivatedOnDockByDefault">true</bool>
<!-- If supported and enabled, are dreams activated when asleep and charging? (by default) -->
@@ -1988,7 +1988,7 @@
This value must be greater than zero, otherwise the device will immediately
fall asleep again as soon as it is awoken.
-->
- <integer name="config_minimumScreenOffTimeout">10000</integer>
+ <integer name="config_minimumScreenOffTimeout">-1</integer>
<!-- User activity timeout: Maximum screen dim duration in milliseconds.
-
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
old mode 100644
new mode 100755
index f84b20c..ac5868d
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -2053,6 +2053,9 @@ public final class PowerManagerService extends SystemService
if (sleepTimeout >= 0) {
timeout = Math.min(timeout, sleepTimeout);
}
+ if (mMinimumScreenOffTimeoutConfig < 0 ) {
+ return mMaximumScreenOffTimeoutFromDeviceAdmin;
+ }
return Math.max(timeout, mMinimumScreenOffTimeoutConfig);
}