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

Commit 6ff08bd4 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into... 

Merge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into mnc-dr-dev am: b32e020d
am: 9161871f

* commit '9161871f':
  DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...
parents b932dc52 9161871f

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -1347,7 +1347,6 @@ public class DeviceIdleController extends SystemService 
                if (DEBUG) Slog.d(TAG, "Moved from STATE_IDLE_PENDING to STATE_SENSING.");

                if (DEBUG) Slog.d(TAG, "Moved from STATE_IDLE_PENDING to STATE_SENSING.");

                EventLogTags.writeDeviceIdle(mState, "step");

                EventLogTags.writeDeviceIdle(mState, "step");

                scheduleSensingAlarmLocked(mConstants.SENSING_TIMEOUT);

                scheduleSensingAlarmLocked(mConstants.SENSING_TIMEOUT);

                cancelSensingAlarmLocked();

                cancelLocatingLocked();

                cancelLocatingLocked();

                mAnyMotionDetector.checkForAnyMotion();

                mAnyMotionDetector.checkForAnyMotion();

                mNotMoving = false;

                mNotMoving = false;
@@ -1359,7 +1358,6 @@ public class DeviceIdleController extends SystemService 
                mState = STATE_LOCATING;

                mState = STATE_LOCATING;

                if (DEBUG) Slog.d(TAG, "Moved from STATE_SENSING to STATE_LOCATING.");

                if (DEBUG) Slog.d(TAG, "Moved from STATE_SENSING to STATE_LOCATING.");

                EventLogTags.writeDeviceIdle(mState, "step");

                EventLogTags.writeDeviceIdle(mState, "step");

                cancelSensingAlarmLocked();

                scheduleSensingAlarmLocked(mConstants.LOCATING_TIMEOUT);

                scheduleSensingAlarmLocked(mConstants.LOCATING_TIMEOUT);

                if (mLocationManager != null

                if (mLocationManager != null

                        && mLocationManager.getProvider(LocationManager.NETWORK_PROVIDER) != null) {

                        && mLocationManager.getProvider(LocationManager.NETWORK_PROVIDER) != null) {
@@ -1429,6 +1427,7 @@ public class DeviceIdleController extends SystemService 
            mState = STATE_ACTIVE;

            mState = STATE_ACTIVE;

            mInactiveTimeout = timeout;

            mInactiveTimeout = timeout;

            EventLogTags.writeDeviceIdle(mState, type);

            EventLogTags.writeDeviceIdle(mState, type);

            cancelSensingAlarmLocked();

            becomeInactiveIfAppropriateLocked();

            becomeInactiveIfAppropriateLocked();

        }

        }

    }

    }