commit 65aa338ab6b500fb509b6702c5d88c47de4f45f0
author Wei Sheng Shih <wilsonshih@google.com> Tue Oct 25 02:07:45 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 25 02:07:45 2022 +0000
tree 793e767b3f231add5050859fdcb4bade84e0e5ca
parent 6445fc9102bd67b8cffbf5106edbc2032ec4882b
parent 0988afc44edfac697e1451261349c8fc39b37e99

Merge "Fixs NPE when start back-to-home animation."

quickstep/src/com/android/quickstep/LauncherBackAnimationController.java

diff --git a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
index 7c0de96..64df9d8 100644
--- a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
+++ b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
@@ -219,12 +219,12 @@
             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);
     }