diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-02-24 22:15:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-24 22:16:00 +0000 |
| commit | f7f80d7b54b11d432bb6e72da526edf369128ea7 (patch) | |
| tree | a8b3a6da7ee79f875b868f60f785c8b36bd25497 /services/java/com/android/server | |
| parent | ffda464851008f750246f343c939d8003071cd23 (diff) | |
| parent | e0dd3ca81d9355701164742d53695cf6d15cfdca (diff) | |
| download | frameworks_base-f7f80d7b54b11d432bb6e72da526edf369128ea7.zip frameworks_base-f7f80d7b54b11d432bb6e72da526edf369128ea7.tar.gz frameworks_base-f7f80d7b54b11d432bb6e72da526edf369128ea7.tar.bz2 | |
Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev
Diffstat (limited to 'services/java/com/android/server')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index f2a747e..db40cbe 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -857,9 +857,8 @@ public final class SystemServer { } } - if (!disableNonCoreServices - && context.getResources().getBoolean(R.bool.config_dreamsSupported)) { - // Dreams (interactive idle-time views, a/k/a screen savers) + if (!disableNonCoreServices) { + // Dreams (interactive idle-time views, a/k/a screen savers, and doze mode) mSystemServiceManager.startService(DreamManagerService.class); } |