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

Commit a8e20176 authored by Erik Wolsheimer's avatar Erik Wolsheimer
Browse files

Revert "Fix race condition triggered by quick stop/start of Dream" 

Causes another race condition

This reverts commit 69515b22.

Bug: 62147987
Change-Id: Ibe6f9bc14ed6cc35d3a23d52300657eaed9bb6d8
parent 69515b22

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

+2 −10
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ public final class DreamManagerService extends SystemService { 
    private boolean mCurrentDreamCanDoze;

    private boolean mCurrentDreamIsDozing;

    private boolean mCurrentDreamIsWaking;

    private Runnable mStopDreamRunnable;

    private int mCurrentDreamDozeScreenState = Display.STATE_UNKNOWN;

    private int mCurrentDreamDozeScreenBrightness = PowerManager.BRIGHTNESS_DEFAULT;
@@ -350,11 +349,6 @@ public final class DreamManagerService extends SystemService { 


    private void startDreamLocked(final ComponentName name,

            final boolean isTest, final boolean canDoze, final int userId) {

        if (mStopDreamRunnable != null) {

            mHandler.removeCallbacks(mStopDreamRunnable);

            mStopDreamRunnable = null;

        }



        if (Objects.equal(mCurrentDreamName, name)

                && mCurrentDreamIsTest == isTest

                && mCurrentDreamCanDoze == canDoze
@@ -392,15 +386,13 @@ public final class DreamManagerService extends SystemService { 
                mCurrentDreamIsWaking = true;

            }



            mStopDreamRunnable = new Runnable() {

            mHandler.post(new Runnable() {

                @Override

                public void run() {

                    Slog.i(TAG, "Performing gentle wake from dream.");

                    mController.stopDream(immediate);

                    mStopDreamRunnable = null;

                }

            };

            mHandler.post(mStopDreamRunnable);

            });

        }

    }