commit | 5583e53909db879b5ca7f31b53793cccc73638f8 | [log] [tgz] |
---|---|---|
author | Winson Chung <winsonc@google.com> | Wed Nov 06 16:25:26 2019 -0800 |
committer | Winson Chung <winsonc@google.com> | Wed Nov 06 16:26:22 2019 -0800 |
tree | b5c66f6f66a0bf4639db83939c2225962d682fb9 | |
parent | 5d3dc9c76dcf6bb046f1790d730373da7baa7336 [diff] |
Skip calling into recents view if the activity is not yet initialized Bug: 143792840 Change-Id: Ib7cde70786a49390b253a57161be8eb66a26a188
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java index 3eb183e..77deace 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
@@ -615,7 +615,9 @@ @Override public void onRecentsAnimationCanceled(ThumbnailData thumbnailData) { super.onRecentsAnimationCanceled(thumbnailData); - mRecentsView.setRecentsAnimationTargets(null, null); + if (mRecentsView != null) { + mRecentsView.setRecentsAnimationTargets(null, null); + } mActivityInitListener.unregister(); mStateCallback.setStateOnUiThread(STATE_GESTURE_CANCELLED | STATE_HANDLER_INVALIDATED); ActiveGestureLog.INSTANCE.addLog("cancelRecentsAnimation");