Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove overlay when DC is mirroring" into sc-v2-dev am: c936811c79 am: 7591c10b95

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

Change-Id: Ic4c7e49d9a7ade723bd2b31f007508ab2d998bf9
This commit is contained in:
TreeHugger Robot
2021-11-09 18:49:17 +00:00
committed by Automerger Merge Worker
parent b06e91906a 7591c10b95
commit e4500fc47a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -5981,7 +5981,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
// Reparent the SurfaceControl of this DisplayContent to null, to prevent content
// being added to it. This ensures that no app launched explicitly on the
// VirtualDisplay will show up as part of the mirrored content.
.reparent(mWindowingLayer, null);
.reparent(mWindowingLayer, null)
.reparent(mOverlayLayer, null);
// Retrieve the size of the DisplayArea to mirror.
updateMirroredSurface(transaction, wc.getDisplayContent().getBounds(), surfaceSize);
mTokenToMirror = tokenToMirror;
@@ -6011,7 +6012,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
// Reparent the SurfaceControl of this DisplayContent back to mSurfaceControl,
// to allow content to be added to it. This allows this DisplayContent to stop
// mirroring and show content normally.
.reparent(mWindowingLayer, mSurfaceControl).apply();
.reparent(mWindowingLayer, mSurfaceControl)
.reparent(mOverlayLayer, mSurfaceControl)
.apply();
// Stop mirroring by destroying the reference to the mirrored layer.
mMirroredSurface = null;
// Do not un-set the token, in case content is removed and mirroring should begin again.