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

Commit e94261b8 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 989b76aa: Merge change Ieca126e6 into eclair 

Merge commit '989b76aa' into eclair-mr2

* commit '989b76aa':
  Fix problem with proximity sensor not reawaking screen if the values change too quickly.
parents d62b063f 989b76aa

services/java/com/android/server/PowerManagerService.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -1803,6 +1803,8 @@ class PowerManagerService extends IPowerManager.Stub 
    }

    }





    private void forceUserActivityLocked() {

    private void forceUserActivityLocked() {

        // cancel animation so userActivity will succeed

        mScreenBrightness.animating = false;

        boolean savedActivityAllowed = mUserActivityAllowed;

        boolean savedActivityAllowed = mUserActivityAllowed;

        mUserActivityAllowed = true;

        mUserActivityAllowed = true;

        userActivity(SystemClock.uptimeMillis(), false);

        userActivity(SystemClock.uptimeMillis(), false);