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

Commit f3820494 authored by Shivam Agrawal's avatar Shivam Agrawal
Browse files

Fix NPE in SplitController#startActivityToSide 

SplitController#startActivityToSide is called from
SplitController#launchPlaceholderIfNecessary with
a null value for the failure callback. If the activity
launch to side fails, then startActivityToSide tries
to pass the failure to the failure callback, which is
null. This CL fixes this bug by checking if the failure
callback is null.

Bug: b/209296363
Test: existing tests pass
Test: launch settings app from overview and observe no crash
Change-Id: I6577d992f48acbaae6b0e9776e65933e779defe3
parent b344d335

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java

+4 −2
Original line number Diff line number Diff line
@@ -91,13 +91,15 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
     */

    public void startActivityToSide(@NonNull Activity launchingActivity, @NonNull Intent intent,

            @Nullable Bundle options, @NonNull SplitRule sideRule,

            @NonNull Consumer<Exception> failureCallback) {

            @Nullable Consumer<Exception> failureCallback) {

        try {

            mPresenter.startActivityToSide(launchingActivity, intent, options, sideRule);

        } catch (Exception e) {

            if (failureCallback != null) {

                failureCallback.accept(e);

            }

        }

    }



    /**

     * Registers the split organizer callback to notify about changes to active splits.