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

Merge "Validate target view surface in PipDismissTargetHandler" into tm-dev am: 5cb6c5a9c9

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

Change-Id: I8d4187b1c51b62435e813013dcdf5bda91149229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2022-04-20 04:46:56 +00:00
committed by Automerger Merge Worker
parent 1790387c8d 5cb6c5a9c9
commit d636f92e2f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipDismissTargetHandler.java
View File

@@ -220,10 +220,16 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen
return;
}
final SurfaceControl targetViewLeash =
mTargetViewContainer.getViewRootImpl().getSurfaceControl();
if (!targetViewLeash.isValid()) {
// The surface of mTargetViewContainer is somehow not ready, bail early
return;
}
// Put the dismiss target behind the task
SurfaceControl.Transaction t = new SurfaceControl.Transaction();
t.setRelativeLayer(mTargetViewContainer.getViewRootImpl().getSurfaceControl(),
mTaskLeash, -1);
t.setRelativeLayer(targetViewLeash, mTaskLeash, -1);
t.apply();
}