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

Merge "Use isSplitActive vs visible when detecting mixed pip/split" into udc-dev

Browse Source
This commit is contained in:
Evan Rosky
2023-05-04 20:05:54 +00:00
committed by Android (Google) Code Review
parent 57340dfca7 6c3d9ca37f
commit aeac802e8d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java
View File

@@ -150,9 +150,9 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler,
@Override @Override
public WindowContainerTransaction handleRequest(@NonNull IBinder transition, public WindowContainerTransaction handleRequest(@NonNull IBinder transition,
@NonNull TransitionRequestInfo request) { @NonNull TransitionRequestInfo request) {
if (mPipHandler.requestHasPipEnter(request) && mSplitHandler.isSplitScreenVisible()) { if (mPipHandler.requestHasPipEnter(request) && mSplitHandler.isSplitActive()) {
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Got a PiP-enter request while " ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Got a PiP-enter request while "
+ "Split-Screen is foreground, so treat it as Mixed."); + "Split-Screen is active, so treat it as Mixed.");
if (request.getRemoteTransition() != null) { if (request.getRemoteTransition() != null) {
throw new IllegalStateException("Unexpected remote transition in" throw new IllegalStateException("Unexpected remote transition in"
+ "pip-enter-from-split request"); + "pip-enter-from-split request");