drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c213b3a3: am f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev

Browse Source 
* commit 'c213b3a34ccee7cfa72dab281cfa950e5f7df6fc':
  Start the dream manager even if dreams are not supported.
This commit is contained in:
Jeff Brown
2014-02-24 22:21:50 +00:00
committed by Android Git Automerger
parent 3dc57b39f2 c213b3a34c
commit cd9cd758d6
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/res/res/values/config.xml
View File

@ -1077,8 +1077,16 @@
<!-- Name of the wimax state tracker clas --> <!-- Name of the wimax state tracker clas -->
<string name="config_wimaxStateTrackerClassname" translatable="false"></string> <string name="config_wimaxStateTrackerClassname" translatable="false"></string>
<!-- Is the dreams feature supported? --> <!-- Specifies whether the dreams feature should be supported.
When true, the system will allow the user to configure dreams (screensavers)
to launch when a user activity timeout occurs or the system is told to nap.
When false, the dreams feature will be disabled (this does not affect dozing).
Consider setting this resource to false or disabling dreams by default when a
doze component is specified below since dreaming will supercede dozing and
will prevent the system from entering a low power state until the dream ends. -->
<bool name="config_dreamsSupported">true</bool> <bool name="config_dreamsSupported">true</bool>
<!-- If supported, are dreams enabled? (by default) --> <!-- If supported, are dreams enabled? (by default) -->
<bool name="config_dreamsEnabledByDefault">true</bool> <bool name="config_dreamsEnabledByDefault">true</bool>
<!-- If supported and enabled, are dreams activated when docked? (by default) --> <!-- If supported and enabled, are dreams activated when docked? (by default) -->

5
services/java/com/android/server/SystemServer.java
View File

@ -857,9 +857,8 @@ public final class SystemServer {
} }
} }
if (!disableNonCoreServices if (!disableNonCoreServices) {
&& context.getResources().getBoolean(R.bool.config_dreamsSupported)) { // Dreams (interactive idle-time views, a/k/a screen savers, and doze mode)
// Dreams (interactive idle-time views, a/k/a screen savers)
mSystemServiceManager.startService(DreamManagerService.class); mSystemServiceManager.startService(DreamManagerService.class);
} }