| commit | 0bef6c937ae28b2e1df97877c425ab6f21afd462 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue May 26 18:48:42 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 26 18:48:42 2020 +0000 |
| tree | 57ccefdb6042729e261475c5b54a66aaf481b66a | |
| parent | 69d772633d0adc15fba28016ef27b6e72012d8dc [diff] | |
| parent | a47a8f1b1d824b4aee292621ea3b6e1b8ce4b6aa [diff] |
Merge "Fix NPE when recents animation controller is null" into ub-launcher3-rvc-dev
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java index 66f6d02..5b396dd 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java
@@ -245,7 +245,9 @@ protected void onRestartLastAppearedTask() { // Finish the controller here, since we won't get onTaskAppeared() for a task that already // appeared. - mRecentsAnimationController.finish(false, null); + if (mRecentsAnimationController != null) { + mRecentsAnimationController.finish(false, null); + } } /**