Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9692654a authored by Sean Stout's avatar Sean Stout Committed by Android (Google) Code Review
Browse files

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

parents 708d39e5 03c10c71

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

+2 −1
Original line number Diff line number Diff line
@@ -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) {