From 561455559538e6115cb634336570deb69ac7869b Mon Sep 17 00:00:00 2001
From: Beth Thibodeau <ethibodeau@google.com>
Date: Wed, 10 Feb 2021 15:48:03 -0500
Subject: [PATCH] Release virtual display before stopping projection

As described in b/140399127, if the media projection is stopped first,
the virtual display will not get released. So we need to release the
display first and stop projection after that.

Bug: 174800535
Test: 'Recording Display' no longer appears in dumpsys after ending a screen recording
Change-Id: I8775068677b3ea5d0836a64579b0539e2e1aafae
---
 .../android/systemui/screenrecord/ScreenMediaRecorder.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
index 5438743252543..26781f4ccf097 100644
--- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
@@ -277,12 +277,12 @@ public class ScreenMediaRecorder {
      */
     void end() {
         mMediaRecorder.stop();
-        mMediaProjection.stop();
         mMediaRecorder.release();
-        mMediaRecorder = null;
-        mMediaProjection = null;
         mInputSurface.release();
         mVirtualDisplay.release();
+        mMediaProjection.stop();
+        mMediaRecorder = null;
+        mMediaProjection = null;
         stopInternalAudioRecording();
 
         Log.d(TAG, "end recording");