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

Commit 06952d92 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

DO NOT MERGE - cherry-picked from master: 



PowerManager: Fix problem waking screen from negative proximity sensor events.

Fixes bug b/2048591

Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 8af2d225

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

+9 −1
Original line number Diff line number Diff line
@@ -2054,7 +2054,15 @@ class PowerManagerService extends IPowerManager.Stub 
        if (event.values[0] == 0.0) {

            goToSleep(milliseconds);

        } else {

            // proximity sensor negative events user activity.

            // temporarily set mUserActivityAllowed to true so this will work

            // even when the keyguard is on.

            synchronized (mLocks) {

                boolean savedActivityAllowed = mUserActivityAllowed;

                mUserActivityAllowed = true;

                userActivity(milliseconds, false);

                mUserActivityAllowed = savedActivityAllowed;

            }

        }

    }