From 88c7c3e08051f4a2be8ee5194214678a07ff7f01 Mon Sep 17 00:00:00 2001 From: Joe LaPenna Date: Thu, 5 Nov 2015 11:26:47 -0800 Subject: [PATCH] Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE Also remove DEBUG-related timeout changes to have consistent behavior. BUG: 24247417 BUG: 25463669 BUG: 23753686 Change-Id: Icfbb1531173477f2649f7f99e3bef9860e5a9ec2 --- services/core/java/com/android/server/AnyMotionDetector.java | 2 +- services/core/java/com/android/server/DeviceIdleController.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/AnyMotionDetector.java b/services/core/java/com/android/server/AnyMotionDetector.java index a0b5c154c13f..92e90a794abe 100644 --- a/services/core/java/com/android/server/AnyMotionDetector.java +++ b/services/core/java/com/android/server/AnyMotionDetector.java @@ -38,7 +38,7 @@ public class AnyMotionDetector { private static final String TAG = "AnyMotionDetector"; - private static final boolean DEBUG = false; + private static final boolean DEBUG = true; // STOPSHIP /** Stationary status is unknown due to insufficient orientation measurements. */ public static final int RESULT_UNKNOWN = -1; diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java index a057ac9dea53..f3eb6c2d8286 100644 --- a/services/core/java/com/android/server/DeviceIdleController.java +++ b/services/core/java/com/android/server/DeviceIdleController.java @@ -100,7 +100,7 @@ public class DeviceIdleController extends SystemService implements AnyMotionDetector.DeviceIdleCallback { private static final String TAG = "DeviceIdleController"; - private static final boolean DEBUG = false; + private static final boolean DEBUG = true; // STOPSHIP private static final boolean COMPRESS_TIME = false; @@ -555,10 +555,8 @@ 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, - !DEBUG ? 4 * 60 * 1000L : 60 * 1000L); - LOCATING_TIMEOUT = mParser.getLong(KEY_LOCATING_TIMEOUT, - !DEBUG ? 30 * 1000L : 15 * 1000L); + SENSING_TIMEOUT = mParser.getLong(KEY_SENSING_TIMEOUT, 4 * 60 * 1000L); + LOCATING_TIMEOUT = mParser.getLong(KEY_LOCATING_TIMEOUT, 30 * 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); -- 2.11.0