commit 7526eb404a652e2ca9beddd79eb672a7f1069574
author Android (Google) Code Review <android-gerrit@google.com> Wed Oct 28 20:44:45 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 28 20:44:45 2009 -0400
tree c3790f3df375bceee86818d75b469f48c77421d7
parent 3179826b1694e89ab48a487a41cf20a8d84b7822
parent 6d8c3df3e94c11d06720e0d7e611f285f8269ac9

Merge change I13ea5a5a into eclair

* changes:
  Fix 2201413: Enable login on Passion when there's no SIM

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

diff --git a/phone/com/android/internal/policy/impl/PhoneWindowManager.java b/phone/com/android/internal/policy/impl/PhoneWindowManager.java
index df8b265..cd06d33 100755
--- a/phone/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/phone/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -2189,8 +2189,9 @@
     }
     
     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) {