From 1ca48732950cc654ec2bfe396922c3f97e6dd507 Mon Sep 17 00:00:00 2001
From: Beth Thibodeau <ethibodeau@google.com>
Date: Wed, 10 Feb 2021 15:48:03 -0500
Subject: 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
Bug: 179931688
Test: 'Recording Display' no longer appears in dumpsys after ending a screen recording
Change-Id: I8775068677b3ea5d0836a64579b0539e2e1aafae
---
 .../src/com/android/systemui/screenrecord/ScreenMediaRecorder.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages/SystemUI/src')

diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
index e6f43c1ff1d2..328cb8ab062f 100644
--- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
@@ -187,12 +187,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");
-- 
cgit v1.2.3