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

Commit d083b379 authored by Joe LaPenna's avatar Joe LaPenna Committed by Android (Google) Code Review
Browse files

Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev

parents 63e6aa85 f6ca46d3

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public class AnyMotionDetector { 


    private static final String TAG = "AnyMotionDetector";



    private static final boolean DEBUG = true;  // STOPSHIP

    private static final boolean DEBUG = false;



    /** Stationary status is unknown due to insufficient orientation measurements. */

    public static final int RESULT_UNKNOWN = -1;

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

+5 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public class DeviceIdleController extends SystemService 
        implements AnyMotionDetector.DeviceIdleCallback {

    private static final String TAG = "DeviceIdleController";



    private static final boolean DEBUG = true;  // STOPSHIP

    private static final boolean DEBUG = false;



    private static final boolean COMPRESS_TIME = false;
@@ -555,8 +555,10 @@ public class DeviceIdleController extends SystemService 


                INACTIVE_TIMEOUT = mParser.getLong(KEY_INACTIVE_TIMEOUT,

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

                SENSING_TIMEOUT = mParser.getLong(KEY_SENSING_TIMEOUT, 4 * 60 * 1000L);

                LOCATING_TIMEOUT = mParser.getLong(KEY_LOCATING_TIMEOUT, 30 * 1000L);

                SENSING_TIMEOUT = mParser.getLong(KEY_SENSING_TIMEOUT,

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

                LOCATING_TIMEOUT = mParser.getLong(KEY_LOCATING_TIMEOUT,

                        !DEBUG ? 30 * 1000L : 15 * 1000L);

                LOCATION_ACCURACY = mParser.getFloat(KEY_LOCATION_ACCURACY, 20);

                MOTION_INACTIVE_TIMEOUT = mParser.getLong(KEY_MOTION_INACTIVE_TIMEOUT,

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