commit 9692654a41a2d20ff7d6c590faecb2615cb58d87
author Sean Stout <sstout@google.com> Wed Apr 14 14:29:02 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 14 14:29:02 2021 +0000
tree e8ceecda1835821f3ca7a73b11b46cdfbb9953d4
parent 708d39e53ee31ed583006fb5f025a9e47d7205ee
parent 03c10c71a68c394a51f89e3f2427cfba1f77784d

Merge "Fix race condition triggered by quick stop/start of Dream" into sc-dev

services/core/java/com/android/server/dreams/DreamManagerService.java

diff --git a/services/core/java/com/android/server/dreams/DreamManagerService.java b/services/core/java/com/android/server/dreams/DreamManagerService.java
index e3eeb6c4..3a7220f7 100644
--- a/services/core/java/com/android/server/dreams/DreamManagerService.java
+++ b/services/core/java/com/android/server/dreams/DreamManagerService.java
@@ -394,7 +394,8 @@
 
     private void startDreamLocked(final ComponentName name,
             final boolean isTest, final boolean canDoze, final int userId) {
-        if (Objects.equals(mCurrentDreamName, name)
+        if (!mCurrentDreamIsWaking
+                && Objects.equals(mCurrentDreamName, name)
                 && mCurrentDreamIsTest == isTest
                 && mCurrentDreamCanDoze == canDoze
                 && mCurrentDreamUserId == userId) {