diff options
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java index 0890861596a5..e63bbc07bc41 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java @@ -252,12 +252,7 @@ public class KeyguardTransitionHandler Log.wtf(TAG, "RemoteException thrown from KeyguardService transition", e); } nextFinishCallback.onTransitionFinished(null); - } else if (nextInfo.getType() == TRANSIT_SLEEP) { - // An empty SLEEP transition comes in as a signal to abort transitions whenever a sleep - // token is held. In cases where keyguard is showing, we are running the animation for - // the device sleeping/waking, so it's best to ignore this and keep playing anyway. - return; - } else if (handles(nextInfo)) { + } else { // In all other cases, fast-forward to let the next queued transition start playing. finishAnimationImmediately(currentTransition, playing); } |