Merge "Sync on notifyWakingUp"

This commit is contained in:
TreeHugger Robot
2022-01-27 08:51:03 +00:00
committed by Android (Google) Code Review

View File

@@ -6629,9 +6629,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
@Override
public void notifyWakingUp() {
// Start a transition for waking. This is needed for showWhenLocked activities.
getTransitionController().requestTransitionIfNeeded(TRANSIT_WAKE, 0 /* flags */,
null /* trigger */, mRootWindowContainer.getDefaultDisplay());
synchronized (mGlobalLock) {
// Start a transition for waking. This is needed for showWhenLocked activities.
getTransitionController().requestTransitionIfNeeded(TRANSIT_WAKE, 0 /* flags */,
null /* trigger */, mRootWindowContainer.getDefaultDisplay());
}
}
@Override