Merge "Unbind from dream overlay in onUnbind." into tm-dev

2022-04-28 21:57:18 +00:00
parent 7585a9580d 1da50a201b
commit 493062c55e
1 changed files with 8 additions and 0 deletions
--- a/core/java/android/service/dreams/DreamService.java
+++ b/core/java/android/service/dreams/DreamService.java
@@ -999,6 +999,14 @@ public class DreamService extends Service implements Window.Callback {
        return mDreamServiceWrapper;
    }

+    @Override
+    public boolean onUnbind(Intent intent) {
+        // We must unbind from any overlay connection if we are unbound before finishing.
+        mOverlayConnection.unbind(this);
+
+        return super.onUnbind(intent);
+    }
+
    /**
     * Stops the dream and detaches from the window.
     * <p>