From 0988afc44edfac697e1451261349c8fc39b37e99 Mon Sep 17 00:00:00 2001 From: wilsonshih Date: Mon, 24 Oct 2022 22:36:23 +0800 Subject: [PATCH] Fixs NPE when start back-to-home animation. Animation target should get from parameter. Bug: 238475284 Test: build/flash, monitor launcher won't crash while start back-to-home animation Change-Id: I7bd254a436ddcf250d90827b9d81d628bcd4313c --- .../android/quickstep/LauncherBackAnimationController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java index 3b3a8e8893..ea685e2573 100644 --- a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java +++ b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java @@ -220,12 +220,12 @@ public class LauncherBackAnimationController { return; } - mTransaction.show(mBackTarget.leash).apply(); + mTransaction.show(appTarget.leash).apply(); mTransaction.setAnimationTransaction(); mInitialTouchPos.set(backEvent.getTouchX(), backEvent.getTouchY()); // TODO(b/218916755): Offset start rectangle in multiwindow mode. - mStartRect.set(mBackTarget.windowConfiguration.getMaxBounds()); + mStartRect.set(appTarget.windowConfiguration.getMaxBounds()); mCurrentRect.set(mStartRect); }