Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joe LaPenna
2015-11-17 02:42:22 +00:00
committed by Android (Google) Code Review
parent 63e6aa8571 f6ca46d301
commit d083b37917
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/AnyMotionDetector.java
View File

@@ -38,7 +38,7 @@ public class AnyMotionDetector {
private static final String TAG = "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. */ /** Stationary status is unknown due to insufficient orientation measurements. */
public static final int RESULT_UNKNOWN = -1; public static final int RESULT_UNKNOWN = -1;

8
services/core/java/com/android/server/DeviceIdleController.java
View File

@@ -100,7 +100,7 @@ public class DeviceIdleController extends SystemService
implements AnyMotionDetector.DeviceIdleCallback { implements AnyMotionDetector.DeviceIdleCallback {
private static final String TAG = "DeviceIdleController"; 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; private static final boolean COMPRESS_TIME = false;
@@ -555,8 +555,10 @@ public class DeviceIdleController extends SystemService
INACTIVE_TIMEOUT = mParser.getLong(KEY_INACTIVE_TIMEOUT, INACTIVE_TIMEOUT = mParser.getLong(KEY_INACTIVE_TIMEOUT,
!COMPRESS_TIME ? 30 * 60 * 1000L : 3 * 60 * 1000L); !COMPRESS_TIME ? 30 * 60 * 1000L : 3 * 60 * 1000L);
SENSING_TIMEOUT = mParser.getLong(KEY_SENSING_TIMEOUT, 4 * 60 * 1000L); SENSING_TIMEOUT = mParser.getLong(KEY_SENSING_TIMEOUT,
LOCATING_TIMEOUT = mParser.getLong(KEY_LOCATING_TIMEOUT, 30 * 1000L); !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); LOCATION_ACCURACY = mParser.getFloat(KEY_LOCATION_ACCURACY, 20);
MOTION_INACTIVE_TIMEOUT = mParser.getLong(KEY_MOTION_INACTIVE_TIMEOUT, MOTION_INACTIVE_TIMEOUT = mParser.getLong(KEY_MOTION_INACTIVE_TIMEOUT,
!COMPRESS_TIME ? 10 * 60 * 1000L : 60 * 1000L); !COMPRESS_TIME ? 10 * 60 * 1000L : 60 * 1000L);