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

2021-04-14 14:29:02 +00:00
parent 708d39e53e 03c10c71a6
commit 9692654a41
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/dreams/DreamManagerService.java
+++ b/services/core/java/com/android/server/dreams/DreamManagerService.java
@@ -394,7 +394,8 @@ public final class DreamManagerService extends SystemService {

    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) {