Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83c662f0 authored by Jerry Chang's avatar Jerry Chang
Browse files

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
parent 8724a1d7

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+1 −2
Original line number Diff line number Diff line
@@ -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;

    }