commit e2445de79347a06bf8edc5d221f7562228801394
author Lucas Silva <lusilva@google.com> Fri Mar 29 13:04:56 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 29 13:04:56 2024 +0000
tree d173c0afda09abf2784b42f60ad3197424f2ca43
parent f221f816a5283e8a7e6ee339f47585450fb1b0fe
parent 4bff841da56be654126de1358fa2b51cbb73ea7e

Merge "Fix DreamService race condition with overlay" into main

core/java/android/service/dreams/DreamService.java

diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java
index 6dcbc8e..4e521d6 100644
--- a/core/java/android/service/dreams/DreamService.java
+++ b/core/java/android/service/dreams/DreamService.java
@@ -1050,12 +1050,10 @@
                     overlay.endDream();
                     mOverlayConnection.unbind();
                     mOverlayConnection = null;
-                    finish();
                 } catch (RemoteException e) {
                     Log.e(mTag, "could not inform overlay of dream end:" + e);
                 }
             });
-            return;
         }
 
         if (mDebug) Slog.v(mTag, "finish(): mFinished=" + mFinished);