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

Commit 4775715d authored by Mark Renouf's avatar Mark Renouf Committed by Automerger Merge Worker
Browse files

Merge "Ensure the Surface is closed when the session ends" into sc-dev am: 71d9c486 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13680312

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id31cd7adbd1550faa2fb572345847acfa2164378
parents d5a7011e 71d9c486

packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureClient.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -278,6 +278,7 @@ public class ScrollCaptureClient { 
                mStarted = true;

                mStarted = true;

            } catch (RemoteException e) {

            } catch (RemoteException e) {

                Log.w(TAG, "Failed to start", e);

                Log.w(TAG, "Failed to start", e);

                mReader.close();

            }

            }

        }

        }
@@ -327,6 +328,7 @@ public class ScrollCaptureClient { 
            }

            }

            if (mStarted) {

            if (mStarted) {

                mShutdownListener = listener;

                mShutdownListener = listener;

                mReader.close();

                try {

                try {

                    // listener called from onConnectionClosed callback

                    // listener called from onConnectionClosed callback

                    mConnection.endCapture();

                    mConnection.endCapture();