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

Commit 14ff66df authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Fix NullPointerException for baseActivity 

* We are using base intent because baseActivity which can be null in
rare cases, add null  check to avoid the crash.
* This is manually CP'd from http://pa/2771550

Bug: 331118994
Test: run auto Test
Change-Id: I8a1bc98f1b53292266184f9f1e78def28c0e795f
parent c7c02412

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

+3 −2
Original line number Diff line number Diff line
@@ -3719,8 +3719,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                mSplitTransitions.startDismissTransition(wct, StageCoordinator.this, stageType,

                        EXIT_REASON_APP_DOES_NOT_SUPPORT_MULTIWINDOW);

                Log.w(TAG, splitFailureMessage("onNoLongerSupportMultiWindow",

                        "app package " + taskInfo.baseActivity.getPackageName()

                        + " does not support splitscreen, or is a controlled activity type"));

                        "app package " + taskInfo.baseIntent.getComponent()

                                + " does not support splitscreen, or is a controlled activity"

                                + " type"));

                if (splitScreenVisible) {

                    handleUnsupportedSplitStart();

                }