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

Commit 9014241e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in SplitController#startActivityToSide" into sc-v2-dev am: 0cf8c02b am: aff122bf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16415040

Change-Id: Ie410b8fedc1631071bce78fe85683b8773b0c4b0
parents 0f22f032 aff122bf

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.