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

Commit 96f6a1a9 authored by Bill Yi's avatar Bill Yi
Browse files

DO NOT MERGE - Fix build issue isScreenOn 

Change-Id: I8821efd561d375c32702be55903fe401ab719e80
parent 5a19dd52

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        initializeHdmiState();



        // Match current screen state.

        if (mPowerManager.isScreenOn()) {

        if (mPowerManager.isInteractive()) {

            wakingUp(null);

        } else {

            goingToSleep(WindowManagerPolicy.OFF_BECAUSE_OF_USER);
@@ -4077,7 +4077,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                                telephonyService.silenceRinger();

                            } else if ((mIncallPowerBehavior

                                    & Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP) != 0

                                    && telephonyService.isOffhook() && isScreenOn) {

                                    && telephonyService.isOffhook() && interactive) {

                                // Otherwise, if "Power button ends call" is enabled,

                                // the Power button will hang up any current active call.

                                hungUp = telephonyService.endCall();