commit ca6480341e78d3adc48b11f8fc83ec3a393a3fd7
author Tony Wickham <twickham@google.com> Wed Jul 06 16:27:14 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 06 16:27:14 2022 +0000
tree a7de84232b45a3cbbccdd3c5e16182fe98b134d5
parent 0c8ceda6e7d20341fef0e20426b4e332e661682f
parent ce563b6b44d19fb905e1c1c8be35d552159af15e

Merge "Add null check on mRecentsView in the InputConsumerProxy" into tm-qpr-dev

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 0972e4e..bce9dbf 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -297,9 +297,12 @@
         mActivityInterface = gestureState.getActivityInterface();
         mActivityInitListener = mActivityInterface.createActivityInitListener(this::onActivityInit);
         mInputConsumerProxy =
-                new InputConsumerProxy(context,
-                        () -> mRecentsView.getPagedViewOrientedState().getRecentsActivityRotation(),
-                        inputConsumer, () -> {
+                new InputConsumerProxy(context, /* rotationSupplier = */ () -> {
+                    if (mRecentsView == null) {
+                        return ROTATION_0;
+                    }
+                    return mRecentsView.getPagedViewOrientedState().getRecentsActivityRotation();
+                }, inputConsumer, /* callback = */ () -> {
                     endRunningWindowAnim(mGestureState.getEndTarget() == HOME /* cancel */);
                     endLauncherTransitionController();
                 }, new InputProxyHandlerFactory(mActivityInterface, mGestureState));