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

Commit 740a46eb authored by Joe LaPenna's avatar Joe LaPenna Committed by android-build-merger
Browse files

Merge "Reduce idle, idle_after_inactive timeouts to 15m" into nyc-dev 

am: 50551006

* commit '50551006':
  Reduce idle, idle_after_inactive timeouts to 15m
parents 9b64d2eb 50551006

services/core/java/com/android/server/DeviceIdleController.java

+5 −8
Original line number Diff line number Diff line
@@ -716,12 +716,6 @@ public class DeviceIdleController extends SystemService 
                    Slog.e(TAG, "Bad device idle settings", e);

                }



                // For now, the default values for watches and non-watches are the same. After

                // investigation, we will likely decrease KEY_INACTIVE_TIMEOUT and other keys in the

                // style of:

                // long inactiveTimeoutDefault = (mHasWatch ? 15 : 30) * 60 * 1000L;

                // INACTIVE_TIMEOUT = mParser.getLong(KEY_INACTIVE_TIMEOUT,

                //         !COMPRESS_TIME ? inactiveTimeoutDefault : (inactiveTimeoutDefault / 10));

                LIGHT_IDLE_TIMEOUT = mParser.getLong(KEY_LIGHT_IDLE_TIMEOUT,

                        !COMPRESS_TIME ? 15 * 60 * 1000L : 60 * 1000L);

                LIGHT_IDLE_MAINTENANCE_MIN_BUDGET = mParser.getLong(
@@ -736,8 +730,9 @@ public class DeviceIdleController extends SystemService 
                MIN_DEEP_MAINTENANCE_TIME = mParser.getLong(

                        KEY_MIN_DEEP_MAINTENANCE_TIME,

                        !COMPRESS_TIME ? 30 * 1000L : 5 * 1000L);

                long inactiveTimeoutDefault = (mHasWatch ? 15 : 30) * 60 * 1000L;

                INACTIVE_TIMEOUT = mParser.getLong(KEY_INACTIVE_TIMEOUT,

                        !COMPRESS_TIME ? 30 * 60 * 1000L : 3 * 60 * 1000L);

                        !COMPRESS_TIME ? inactiveTimeoutDefault : (inactiveTimeoutDefault / 10));

                SENSING_TIMEOUT = mParser.getLong(KEY_SENSING_TIMEOUT,

                        !DEBUG ? 4 * 60 * 1000L : 60 * 1000L);

                LOCATING_TIMEOUT = mParser.getLong(KEY_LOCATING_TIMEOUT,
@@ -745,8 +740,10 @@ public class DeviceIdleController extends SystemService 
                LOCATION_ACCURACY = mParser.getFloat(KEY_LOCATION_ACCURACY, 20);

                MOTION_INACTIVE_TIMEOUT = mParser.getLong(KEY_MOTION_INACTIVE_TIMEOUT,

                        !COMPRESS_TIME ? 10 * 60 * 1000L : 60 * 1000L);

                long idleAfterInactiveTimeout = (mHasWatch ? 15 : 30) * 60 * 1000L;

                IDLE_AFTER_INACTIVE_TIMEOUT = mParser.getLong(KEY_IDLE_AFTER_INACTIVE_TIMEOUT,

                        !COMPRESS_TIME ? 30 * 60 * 1000L : 3 * 60 * 1000L);

                        !COMPRESS_TIME ? idleAfterInactiveTimeout

                                       : (idleAfterInactiveTimeout / 10));

                IDLE_PENDING_TIMEOUT = mParser.getLong(KEY_IDLE_PENDING_TIMEOUT,

                        !COMPRESS_TIME ? 5 * 60 * 1000L : 30 * 1000L);

                MAX_IDLE_PENDING_TIMEOUT = mParser.getLong(KEY_MAX_IDLE_PENDING_TIMEOUT,