summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jerry Chang <chenghsiuchang@google.com> 2022-05-18 09:28:36 +0000
committer Jerry Chang <chenghsiuchang@google.com> 2022-05-18 09:28:36 +0000
commit83c662f043f9d08ce9944f1e93b73f538b80b5e5 (patch)
treec609cf52cf526ac26fc1889af11ae5b718dbdc27
parent8724a1d75f9f043aedd51dcf550f9f63499d6d11 (diff)
Fix NPE when launching fullscreen app during split screen mode
Prevent appending divider bar into transition when it's going to be released right away. Fix: 232322741 Test: enable shell transition, trigger split screen, verified launching another fullscreen app won't crash. Change-Id: I79edf0738333cec6e88d09f81d1000b034a6ae1e
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
index f9e1b2fa4c7c..8db97b42b6eb 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
@@ -1708,8 +1708,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
logExitToStage(dismissReason, toStage == STAGE_TYPE_MAIN);
}
- addDividerBarToTransition(info, t, false /* show */);
-
// Hide divider and dim layer on transition finished.
setDividerVisibility(false, finishT);
finishT.hide(mMainStage.mDimLayer);
@@ -1731,6 +1729,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
return false;
}
+ addDividerBarToTransition(info, t, false /* show */);
return true;
}