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

Commit c956023f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ignore power presses from lift and biometric wake" into tm-qpr-dev

parents 6651ac51 c1e2804b

core/java/android/view/WindowManagerPolicyConstants.java

+3 −0
Original line number Diff line number Diff line
@@ -169,6 +169,9 @@ public interface WindowManagerPolicyConstants { 
            case PowerManager.WAKE_REASON_POWER_BUTTON:

            case PowerManager.WAKE_REASON_PLUGGED_IN:

            case PowerManager.WAKE_REASON_GESTURE:

            case PowerManager.WAKE_REASON_TAP:

            case PowerManager.WAKE_REASON_LIFT:

            case PowerManager.WAKE_REASON_BIOMETRIC:

            case PowerManager.WAKE_REASON_CAMERA_LAUNCH:

            case PowerManager.WAKE_REASON_WAKE_KEY:

            case PowerManager.WAKE_REASON_WAKE_MOTION:

services/core/java/com/android/server/policy/PhoneWindowManager.java

+3 −4
Original line number Diff line number Diff line
@@ -1077,10 +1077,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        // a tendency to hit the power button immediately when they pick up their device, and we

        // don't want to put the device back to sleep in those cases.

        final PowerManager.WakeData lastWakeUp = mPowerManagerInternal.getLastWakeup();

        if (lastWakeUp != null && lastWakeUp.wakeReason == PowerManager.WAKE_REASON_GESTURE) {

            final int gestureDelayMillis = Settings.Global.getInt(mContext.getContentResolver(),

                    Settings.Global.POWER_BUTTON_SUPPRESSION_DELAY_AFTER_GESTURE_WAKE,

                    POWER_BUTTON_SUPPRESSION_DELAY_DEFAULT_MILLIS);

        if (lastWakeUp != null && (lastWakeUp.wakeReason == PowerManager.WAKE_REASON_GESTURE

                || lastWakeUp.wakeReason == PowerManager.WAKE_REASON_LIFT

                || lastWakeUp.wakeReason == PowerManager.WAKE_REASON_BIOMETRIC)) {

            final long now = SystemClock.uptimeMillis();

            if (mPowerButtonSuppressionDelayMillis > 0

                    && (now < lastWakeUp.wakeTime + mPowerButtonSuppressionDelayMillis)) {