Skip to content

Commit

Permalink
Remove pauser until crbug.com/1237981 is resolved
Browse files Browse the repository at this point in the history
(cherry picked from commit 9658910)

Bug: 1234555, 1237981
Test: no clear repro step. speculative fix.
Change-Id: Id86055394c2e33eb8b682709a2cc3f25c0d63714
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3082206
Commit-Queue: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#910053}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3111090
Commit-Queue: Daniel Gagnon <dgagnon@google.com>
Commit-Queue: Ahmed Fakhry <afakhry@chromium.org>
Auto-Submit: Daniel Gagnon <dgagnon@google.com>
Cr-Commit-Position: refs/branch-heads/4515@{#2073}
Cr-Branched-From: 488fc70-refs/heads/master@{#885287}
  • Loading branch information
mitoshima authored and Chromium LUCI CQ committed Aug 20, 2021
1 parent 5f357b9 commit 6ded68a
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions ash/wm/lock_state_controller.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/shutdown_reason.h"
#include "ash/utility/occlusion_tracker_pauser.h"
#include "ash/wallpaper/wallpaper_controller_impl.h"
#include "ash/wallpaper/wallpaper_widget_controller.h"
#include "ash/wm/session_state_animator.h"
Expand Down Expand Up @@ -248,8 +247,6 @@ void LockStateController::OnLockStateChanged(bool locked) {

system_is_locked_ = locked;

Shell::Get()->occlusion_tracker_pauser()->PauseUntilAnimationsEnd();

if (locked) {
StartPostLockAnimation();

Expand Down

0 comments on commit 6ded68a

Please sign in to comment.