commit 8ddc17f325c54598473a3f0cf726358a1a8619c7
author android-build-team Robot <android-build-team-robot@google.com> Tue Sep 24 01:11:24 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Sep 24 01:11:24 2019 +0000
tree 87bc88c0eb8596bf90eda5e30ddd23595579c54e
parent b5a9b67fcacec3f3d4191bbf67c9315c9cdb23a3
parent d2d58656a4ac1da8580c3636a681f36cba0c1ba9

Snap for 5895359 from d2d58656a4ac1da8580c3636a681f36cba0c1ba9 to qt-qpr1-release

Change-Id: I05de7323b6e2ab3617eb0e14e30467c67a4be797

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
index 25cc33d..36eb8a1 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
@@ -381,6 +381,10 @@
             TaskView runningTaskView = recentsView.getRunningTaskView();
             if (runningTaskView == null) {
                 runningTaskView = recentsView.getTaskViewAt(recentsView.getCurrentPage());
+                if (runningTaskView == null) {
+                    // There are no task views in LockTask mode when Overview is enabled.
+                    return;
+                }
             }
             TimeInterpolator oldInterpolator = translateY.getInterpolator();
             Rect fallbackInsets = launcher.getDeviceProfile().getInsets();