Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3651cb7b authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am cd9cd758: am c213b3a3: am f7f80d7b: Merge "Start the dream manager even if... 

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

* commit 'cd9cd758':
  Start the dream manager even if dreams are not supported.
parents 95286208 cd9cd758

core/res/res/values/config.xml

+9 −1
Original line number Original line Diff line number Diff line
@@ -1083,8 +1083,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) -->

services/java/com/android/server/SystemServer.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -851,9 +851,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);

            }

            }