summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjhonboy121 <alfredmathew05@gmail.com>2022-03-26 19:38:28 +0530
committeralk3pInjection <webmaster@raspii.tech>2022-05-07 00:20:58 +0800
commit5d577a4d46e188ad55eee6d7c711dce3ef1963bc (patch)
tree823d9fab58eb724b1b9f24c85d1a35625bc0113e
parent71c75291753e69a37fe0c0531f31a29677a16874 (diff)
RecentsView: add null check for mFirstFloatingTaskView
Change-Id: I6a4ee3bce3df09fa66f381bca52441c17a599504 Signed-off-by: jhonboy121 <alfredmathew05@gmail.com>
-rw-r--r--quickstep/src/com/android/quickstep/views/RecentsView.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index b646a0ce1c..c8bbf43619 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3966,6 +3966,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
mSplitSelectStateController.getActiveSplitStagePosition(), firstTaskEndingBounds,
secondTaskEndingBounds);
+ if (mFirstFloatingTaskView == null) return;
mFirstFloatingTaskView.getBoundsOnScreen(firstTaskStartingBounds);
mFirstFloatingTaskView.addAnimation(pendingAnimation,
new RectF(firstTaskStartingBounds), firstTaskEndingBounds, mFirstFloatingTaskView,
@@ -4039,8 +4040,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
mSplitSelectStateController.getActiveSplitStagePosition(), mTempRect);
mTempRectF.set(mTempRect);
// TODO(194414938) set correct corner radius
- mFirstFloatingTaskView.updateOrientationHandler(mOrientationHandler);
- mFirstFloatingTaskView.update(mTempRectF, /*progress=*/1f, /*windowRadius=*/0f);
+ if (mFirstFloatingTaskView != null) {
+ mFirstFloatingTaskView.updateOrientationHandler(mOrientationHandler);
+ mFirstFloatingTaskView.update(mTempRectF, /*progress=*/1f, /*windowRadius=*/0f);
+ }
PagedOrientationHandler orientationHandler = getPagedOrientationHandler();
Pair<FloatProperty, FloatProperty> taskViewsFloat =