diff options
| author | 2015-11-17 02:42:10 +0000 | |
|---|---|---|
| committer | 2015-11-17 02:42:10 +0000 | |
| commit | f6ca46d301b4877e0f001d5c0e6c802952e54efb (patch) | |
| tree | 731a90ccc423eac72e162788de752e52b53439ff | |
| parent | 88c7c3e08051f4a2be8ee5194214678a07ff7f01 (diff) | |
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
This reverts commit 88c7c3e08051f4a2be8ee5194214678a07ff7f01.
Change-Id: I2c6d7d1d076bee0dc905d0986ced55e49481af26
BUG: 23753686
| -rw-r--r-- | services/core/java/com/android/server/AnyMotionDetector.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/DeviceIdleController.java | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/AnyMotionDetector.java b/services/core/java/com/android/server/AnyMotionDetector.java index 92e90a794abe..a0b5c154c13f 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 = true; // STOPSHIP + private static final boolean DEBUG = false; /** 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 f3eb6c2d8286..a057ac9dea53 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 = 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); |