From b4e2d1c2aaebd6f8bd8ef78fbbc75b0ff359ae49 Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Mon, 23 Nov 2009 15:54:10 -0500
Subject: [PATCH] END_BUTTON_BEHAVIOR setting should affect end call button
 only (not power button)

Fixes b/2212852 ("end button behavior" in spare parts doesn't work)

Change-Id: Ia17f37ad82b17f3a0e1ceb1ab7a0211b1d3ad8be
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 .../internal/policy/impl/PhoneWindowManager.java       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
index 987e280c19ddc..3e669f6f3fc7c 100755
--- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1718,8 +1718,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                     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
                                 || (sleeps && !gohome)
                                 || (gohome && !goHome() && sleeps)) {