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

Commit c17f07aa authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Revert "Don't activate keyguard if screen is turned off while proximity sensor is active." 

This reverts commit ddfe879b.
parent c7aef5d0

core/java/android/view/WindowManagerPolicy.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -361,8 +361,6 @@ public interface WindowManagerPolicy { 
    public final int OFF_BECAUSE_OF_USER = 1;

    public final int OFF_BECAUSE_OF_USER = 1;

    /** Screen turned off because of timeout */

    /** Screen turned off because of timeout */

    public final int OFF_BECAUSE_OF_TIMEOUT = 2;

    public final int OFF_BECAUSE_OF_TIMEOUT = 2;

    /** Screen turned off because of proximity sensor */

    public final int OFF_BECAUSE_OF_PROXIMITY_SENSOR = 3;





    /**

    /**

     * Magic constant to {@link IWindowManager#setRotation} to not actually

     * Magic constant to {@link IWindowManager#setRotation} to not actually

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -957,9 +957,6 @@ class PowerManagerService extends IPowerManager.Stub 




    private void sendNotificationLocked(boolean on, int why)

    private void sendNotificationLocked(boolean on, int why)

    {

    {

        if (mProximitySensorActive) {

            why = WindowManagerPolicy.OFF_BECAUSE_OF_PROXIMITY_SENSOR;

        }

        if (!on) {

        if (!on) {

            mStillNeedSleepNotification = false;

            mStillNeedSleepNotification = false;

        }

        }