From 629fe737bb001e38a2c515a243383b1b5b1c91b8 Mon Sep 17 00:00:00 2001
From: Chris Li <lihongyu@google.com>
Date: Thu, 27 Jan 2022 14:22:50 +0800
Subject: [PATCH] Sync on notifyWakingUp

Fix: 216284843
Test: pass existing
Change-Id: Icf27f86d27281cf515d3a55f59a5dd7909fccd12
---
 .../com/android/server/wm/ActivityTaskManagerService.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index ed9dcef864c67..6350d9f7afc16 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -6624,9 +6624,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