From ddbaadb5627927f1d425b3f999d2d365db3e90b2 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Mon, 13 Jul 2020 12:32:37 -0700 Subject: [PATCH] Wait until activity present before calling onEndTargetCalculated() At least one code path relies on the activity to be created: if the end target is RECENTS, we add a state manager listener to see when user goes to NORMAL state. Fixes: 160903658 Change-Id: I3449dec773399f7e9cf2e7ef8b79734b1baa59b4 --- .../src/com/android/quickstep/BaseSwipeUpHandlerV2.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java index 37aa0dadd2..ca8741da82 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java @@ -264,10 +264,6 @@ public abstract class BaseSwipeUpHandlerV2, Q exte mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_RESUME_LAST_TASK, this::notifyTransitionCancelled); - mGestureState.runOnceAtState(STATE_END_TARGET_SET, - () -> mDeviceState.onEndTargetCalculated(mGestureState.getEndTarget(), - mActivityInterface)); - if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) { mStateCallback.addChangeListener(STATE_APP_CONTROLLER_RECEIVED | STATE_LAUNCHER_PRESENT | STATE_SCREENSHOT_VIEW_SHOWN | STATE_CAPTURE_SCREENSHOT, @@ -398,6 +394,10 @@ public abstract class BaseSwipeUpHandlerV2, Q exte mGestureState.getActivityInterface().setOnDeferredActivityLaunchCallback( mOnDeferredActivityLaunch); + mGestureState.runOnceAtState(STATE_END_TARGET_SET, + () -> mDeviceState.onEndTargetCalculated(mGestureState.getEndTarget(), + mActivityInterface)); + notifyGestureStartedAsync(); }