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

Commit c2912a66 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 25490 into eclair 

* changes:
  Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
parents dfe095a0 c17f07aa

core/java/android/view/WindowManagerPolicy.java

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

    /** Screen turned off because of timeout */

    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

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

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


    private void sendNotificationLocked(boolean on, int why)

    {

        if (mProximitySensorActive) {

            why = WindowManagerPolicy.OFF_BECAUSE_OF_PROXIMITY_SENSOR;

        }

        if (!on) {

            mStillNeedSleepNotification = false;

        }