Merge "Fix NPE when launching fullscreen app during split screen mode" into tm-qpr-dev am: 63a05a9d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18452912 Change-Id: Ie7087fe951f75f9ac11326e6dd6f0bb942c6a886 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1718,8 +1718,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);
|
||||
@@ -1741,6 +1739,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
|
||||
return false;
|
||||
}
|
||||
|
||||
addDividerBarToTransition(info, t, false /* show */);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user