diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-10-23 17:04:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-23 17:04:55 +0000 |
| commit | b32e020d237cfd94cdfe8c589900a899dc14413a (patch) | |
| tree | 6b9f57d745af9de3493eea1fbb4f0ebf30a84d69 | |
| parent | a665ea72075dbaa5a86f866ee6c8df5a80f1ced3 (diff) | |
| parent | 7730cd2740a68ecd58fa2c0d2daf45b500d50fa1 (diff) | |
| download | frameworks_base-b32e020d237cfd94cdfe8c589900a899dc14413a.zip frameworks_base-b32e020d237cfd94cdfe8c589900a899dc14413a.tar.gz frameworks_base-b32e020d237cfd94cdfe8c589900a899dc14413a.tar.bz2 | |
Merge "DO NOT MERGE Fix issue #24118803: The screen doesn't turn off..." into mnc-dr-dev
| -rw-r--r-- | services/core/java/com/android/server/DeviceIdleController.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java index d2d4b7b..b88658b 100644 --- a/services/core/java/com/android/server/DeviceIdleController.java +++ b/services/core/java/com/android/server/DeviceIdleController.java @@ -1280,7 +1280,6 @@ public class DeviceIdleController extends SystemService if (DEBUG) Slog.d(TAG, "Moved from STATE_IDLE_PENDING to STATE_SENSING."); EventLogTags.writeDeviceIdle(mState, "step"); scheduleSensingAlarmLocked(mConstants.SENSING_TIMEOUT); - cancelSensingAlarmLocked(); cancelLocatingLocked(); mAnyMotionDetector.checkForAnyMotion(); mNotMoving = false; @@ -1292,7 +1291,6 @@ public class DeviceIdleController extends SystemService mState = STATE_LOCATING; if (DEBUG) Slog.d(TAG, "Moved from STATE_SENSING to STATE_LOCATING."); EventLogTags.writeDeviceIdle(mState, "step"); - cancelSensingAlarmLocked(); scheduleSensingAlarmLocked(mConstants.LOCATING_TIMEOUT); mLocating = true; mLocationManager.requestLocationUpdates(mLocationRequest, mGenericLocationListener, @@ -1350,6 +1348,7 @@ public class DeviceIdleController extends SystemService mState = STATE_ACTIVE; mInactiveTimeout = timeout; EventLogTags.writeDeviceIdle(mState, type); + cancelSensingAlarmLocked(); becomeInactiveIfAppropriateLocked(); } } |