resolved conflicts for merge of b64c72df to eclair-mr2

Change-Id: If3c6a28281b08464fd3f24e752f5e07f6f8a420e

diff --cc phone/com/android/internal/policy/impl/PhoneWindowManager.java
index 4abd268,2f9faae..e7a03e4
--- 1/phone/com/android/internal/policy/impl/PhoneWindowManager.java
--- 2/phone/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/phone/com/android/internal/policy/impl/PhoneWindowManager.java
@@@ -1719,15 -1725,9 +1725,15 @@@ public class PhoneWindowManager impleme
                      mHandler.removeCallbacks(mPowerLongPress);
                      if (mShouldTurnOffOnKeyUp) {
                          mShouldTurnOffOnKeyUp = false;
 -                        boolean gohome = (mEndcallBehavior & ENDCALL_HOME) != 0;
 -                        boolean sleeps = (mEndcallBehavior & ENDCALL_SLEEPS) != 0;
 +                        boolean gohome, sleeps;
 +                        if (code == KeyEvent.KEYCODE_ENDCALL) {
 +                            gohome = (mEndcallBehavior & ENDCALL_HOME) != 0;
 +                            sleeps = (mEndcallBehavior & ENDCALL_SLEEPS) != 0;
 +                        } else {
 +                            gohome = false;
 +                            sleeps = true;
 +                        }
-                         if (keyguardShowing
+                         if (keyguardActive
                                  || (sleeps && !gohome)
                                  || (gohome && !goHome() && sleeps)) {
                              // they must already be on the keyguad or home screen,