Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in SplitController#startActivityToSide" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-07 22:38:37 +00:00
committed by Android (Google) Code Review
parent 209eb582b1 f382049442
commit 0cf8c02bf1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,13 +91,15 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
*/ */
public void startActivityToSide(@NonNull Activity launchingActivity, @NonNull Intent intent, public void startActivityToSide(@NonNull Activity launchingActivity, @NonNull Intent intent,
@Nullable Bundle options, @NonNull SplitRule sideRule, @Nullable Bundle options, @NonNull SplitRule sideRule,
@NonNull Consumer<Exception> failureCallback) { @Nullable Consumer<Exception> failureCallback) {
try { try {
mPresenter.startActivityToSide(launchingActivity, intent, options, sideRule); mPresenter.startActivityToSide(launchingActivity, intent, options, sideRule);
} catch (Exception e) { } catch (Exception e) {
if (failureCallback != null) {
failureCallback.accept(e); failureCallback.accept(e);
} }
} }
}
/** /**
* Registers the split organizer callback to notify about changes to active splits. * Registers the split organizer callback to notify about changes to active splits.