PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

17.5/ Remove synchronized calls, verify controller before finishing animation

Browse Source 
- The states that trigger the call are all on the UI thread, so we
  shouldn't need to synchronize before calling into it.  But the
  second issue is that we set those states when the gesture ends and
  we calculate the end target.  This can happen before the animation
  started or after the animation has been canceled, so we need to
  guard against the null controller as well.

Bug: 143153963
Change-Id: I4649483a52c85c5662665d5e8905b49d5623b6dc
This commit is contained in:
Winson Chung
2019-10-29 10:47:15 -07:00
parent 52c57f73d2
commit 4356311cfe
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
+8 -7
View File
@@ -1188,20 +1188,21 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity>
private void finishCurrentTransitionToRecents() {
if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
} else if (!hasTargets()) {
// If there are no targets, then there is nothing to finish
} else if (!hasTargets() || mRecentsAnimationController == null) {
// If there are no targets or the animation not started, then there is nothing to finish
mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
} else {
synchronized (mRecentsAnimationController) {
mRecentsAnimationController.finish(true /* toRecents */,
() -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED));
}
mRecentsAnimationController.finish(true /* toRecents */,
() -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED));
}
ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", true);
}
private void finishCurrentTransitionToHome() {
synchronized (mRecentsAnimationController) {
if (!hasTargets() || mRecentsAnimationController == null) {
// If there are no targets or the animation not started, then there is nothing to finish
mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
} else {
mRecentsAnimationController.finish(true /* toRecents */,
() -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED),
true /* sendUserLeaveHint */);