diff options
Diffstat (limited to 'policy/src')
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 97b4cb5..215f597 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1132,7 +1132,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { com.android.internal.R.bool.config_enableDreams); mScreenSaverEnabledByUser = 0 != Settings.Secure.getInt(resolver, - Settings.Secure.SCREENSAVER_ENABLED, 1); + Settings.Secure.SCREENSAVER_ENABLED, 0); if (SEPARATE_TIMEOUT_FOR_SCREEN_SAVER) { mScreenSaverTimeout = Settings.Secure.getInt(resolver, @@ -4076,7 +4076,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (dm == null) return; try { - if (localLOGV) Log.v(TAG, "startScreenSaver: awakening..."); + if (!dm.isDreaming()) return; + + if (localLOGV) Log.v(TAG, "stopScreenSaver: awakening..."); dm.awaken(); } catch (RemoteException ex) { |