Merge "Fix 2448345: Fix tactile feedback bug in password/PIN and pattern unlock."
diff --git a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java
index c8e8cd47..f82d1a9 100644
--- a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java
+++ b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java
@@ -147,6 +147,7 @@
     private IBinder mSecureLockIcon = null;
 
     private boolean mSystemReady;
+    private boolean mFirstShow = true;
 
     /** Low level access to the power manager for enableUserActivity.  Having this
      * requires that we run in the system process.  */
@@ -946,7 +947,11 @@
             if (DEBUG) Log.d(TAG, "handleShow");
             if (!mSystemReady) return;
 
-            playSounds(true);
+            if (mFirstShow) {
+                mFirstShow = false;
+            } else {
+                playSounds(true);
+            }
 
             mKeyguardViewManager.show();
             mShowing = true;