diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java
index dbb3577108508..7ce0544d94461 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java
@@ -35,7 +35,7 @@ import android.provider.MediaStore;
 import android.util.Log;
 import android.view.WindowManager;
 
-import com.android.internal.policy.impl.keyguard.KeyguardSecurityCallback.OnDismissAction;
+import com.android.internal.policy.impl.keyguard.KeyguardHostView.OnDismissAction;
 import com.android.internal.widget.LockPatternUtils;
 
 import java.util.List;
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
index 5b9eb86728122..211560215830e 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
@@ -53,7 +53,6 @@ import android.view.animation.AnimationUtils;
 import android.widget.RemoteViews.OnClickHandler;
 
 import com.android.internal.R;
-import com.android.internal.policy.impl.keyguard.KeyguardSecurityCallback.OnDismissAction;
 import com.android.internal.policy.impl.keyguard.KeyguardSecurityModel.SecurityMode;
 import com.android.internal.widget.LockPatternUtils;
 
@@ -115,6 +114,11 @@ public class KeyguardHostView extends KeyguardViewBase {
         void userActivity();
     }
 
+    /*package*/ interface OnDismissAction {
+        /* returns true if the dismiss should be deferred */
+        boolean onDismiss();
+    }
+
     public KeyguardHostView(Context context) {
         this(context, null);
     }
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityCallback.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityCallback.java
index e1a0a211f02ec..7e6c108908eab 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityCallback.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityCallback.java
@@ -15,14 +15,10 @@
  */
 package com.android.internal.policy.impl.keyguard;
 
+import com.android.internal.policy.impl.keyguard.KeyguardHostView.OnDismissAction;
+
 public interface KeyguardSecurityCallback {
 
-    /*package*/ interface OnDismissAction {
-
-        /* returns true if the dismiss should be deferred */
-        boolean onDismiss();
-    }
-
     /**
      * Dismiss the given security screen.
      * @param securityVerified true if the user correctly entered credentials for the given screen.
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
index 23c642dc882d0..df4c661ab2d3a 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
@@ -567,6 +567,8 @@ public class KeyguardViewMediator {
             mScreenOn = false;
             if (DEBUG) Log.d(TAG, "onScreenTurnedOff(" + why + ")");
 
+            mKeyguardDonePending = false;
+
             // Lock immediately based on setting if secure (user has a pin/pattern/password).
             // This also "locks" the device when not secure to provide easy access to the
             // camera while preventing unwanted input.
@@ -1226,6 +1228,7 @@ public class KeyguardViewMediator {
 
             mKeyguardViewManager.show(options);
             mShowing = true;
+            mKeyguardDonePending = false;
             updateActivityLockScreenState();
             adjustStatusBarLocked();
             userActivity();
@@ -1261,6 +1264,7 @@ public class KeyguardViewMediator {
 
             mKeyguardViewManager.hide();
             mShowing = false;
+            mKeyguardDonePending = false;
             updateActivityLockScreenState();
             adjustStatusBarLocked();
         }