From a8e20176affe306f4e9e8e841abe75ec58774302 Mon Sep 17 00:00:00 2001 From: Erik Wolsheimer Date: Mon, 5 Jun 2017 16:49:28 +0000 Subject: Revert "Fix race condition triggered by quick stop/start of Dream" Causes another race condition This reverts commit 69515b2261335be4bd8510ed5a40a6bed3d7b48f. Bug: 62147987 Change-Id: Ibe6f9bc14ed6cc35d3a23d52300657eaed9bb6d8 --- .../java/com/android/server/dreams/DreamManagerService.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/services/core/java/com/android/server/dreams/DreamManagerService.java b/services/core/java/com/android/server/dreams/DreamManagerService.java index cbc1039f82cb..79a4deebc3da 100644 --- a/services/core/java/com/android/server/dreams/DreamManagerService.java +++ b/services/core/java/com/android/server/dreams/DreamManagerService.java @@ -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); + }); } } -- cgit v1.2.3-59-g8ed1b