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 am: 0cf8c02bf1

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

Change-Id: I669e35e415ceb267bafb25617a189ddd92aaa1f3
This commit is contained in:
TreeHugger Robot
2021-12-07 22:42:10 +00:00
committed by Automerger Merge Worker
parent 4021225090 0cf8c02bf1
commit aff122bfa6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,11 +91,13 @@ 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) {
failureCallback.accept(e); if (failureCallback != null) {
failureCallback.accept(e);
}
} }
} }