From 89b17225f89ea2092b215a6757ed2d240c24098d Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Tue, 27 Oct 2009 14:54:09 -0700
Subject: [PATCH] Fix for 2201954: Disable haptic feedback for hard keys while
 keyguard is showing

---
 .../com/android/internal/policy/impl/PhoneWindowManager.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
index df8b265917e47..cd06d33f4b146 100755
--- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -2189,8 +2189,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     }
     
     public boolean performHapticFeedbackLw(WindowState win, int effectId, boolean always) {
-        if (!always && Settings.System.getInt(mContext.getContentResolver(),
-                Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) == 0) {
+        final boolean hapticsDisabled = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) == 0;
+        if (!always && (hapticsDisabled || mKeyguardMediator.isShowing())) {
             return false;
         }
         switch (effectId) {