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

Commit b6aa47b6 authored by Lucas Silva's avatar Lucas Silva
Browse files

Fix system dream component race condition 

There's a delay between when the doze dream starts and when it notifies DreamManager that its dozing. If setSystemDreamComponent is called during this delay, then we may enter the lowlight dream from the doze dream.

To avoid this, we check if the current dream can doze at all, which is only true for the doze dream. This gives us the signal that its a doze dream sooner than the actual isDozing check.

Bug: 404968947
Test: manually by forcing lowlight using adb
Flag: EXEMPT bugfix
Change-Id: I77fc178b6a4e014be051966188f593ae0ecea93e
parent 4a76e99c

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

+6 −1
Original line number Diff line number Diff line
@@ -495,6 +495,11 @@ public final class DreamManagerService extends SystemService { 
        }

    }



    @GuardedBy("mLock")

    private boolean currentDreamCanDozeLocked() {

      return mCurrentDream != null && mCurrentDream.canDoze;

    }



    @VisibleForTesting

    boolean dreamConditionActiveInternal() {

        synchronized (mLock) {
@@ -808,7 +813,7 @@ public final class DreamManagerService extends SystemService { 
            mSystemDreamComponent = componentName;

            reportKeepDreamingWhenUnpluggingChanged(shouldKeepDreamingWhenUnplugging());

            // Switch dream if currently dreaming and not dozing.

            if (isDreamingInternal() && !isDozingInternal()) {

            if (isDreamingInternal() && !currentDreamCanDozeLocked()) {

                startDreamInternal(false /*doze*/, (mSystemDreamComponent == null ? "clear" : "set")

                        + " system dream component" /*reason*/);

            }