| commit | f3cfd0ccad0a5058eeabc47e10c76eea4435370a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue May 26 19:10:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 26 19:10:04 2020 +0000 |
| tree | 2c28dfcf4e0a84c7499ca6e54f6b9a922d5a023d | |
| parent | 1b777fc2c367cd5ea4012d3882baf68aa8806c8d [diff] | |
| parent | 0bef6c937ae28b2e1df97877c425ab6f21afd462 [diff] |
Merge "Fix NPE when recents animation controller is null" into ub-launcher3-rvc-dev am: 0bef6c937a Change-Id: I3ce85e6eea0bf8c0e0e274c8b45eb19fa0d3dafb
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); + } } /**