From 2270753deda01d8290840088d3d89e877f04566d Mon Sep 17 00:00:00 2001
From: Mark Renouf <mrenouf@google.com>
Date: Wed, 24 Feb 2021 02:58:26 +0000
Subject: [PATCH] Ensure the Surface is closed when the session ends

Bug: 175830670
Test: manual
Change-Id: Ifa86130810e19e45a2747076c6fd298fb2ec6cd1
---
 .../com/android/systemui/screenshot/ScrollCaptureClient.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureClient.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureClient.java
index 70be601c3e09a..54b99bbe74ccf 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureClient.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureClient.java
@@ -278,6 +278,7 @@ public class ScrollCaptureClient {
                 mStarted = true;
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed to start", e);
+                mReader.close();
             }
         }
 
@@ -327,6 +328,7 @@ public class ScrollCaptureClient {
             }
             if (mStarted) {
                 mShutdownListener = listener;
+                mReader.close();
                 try {
                     // listener called from onConnectionClosed callback
                     mConnection.endCapture();