commit be24c2c8ec93045e09d9bcedebe3d26afb0e5abf
author android-build-team Robot <android-build-team-robot@google.com> Tue Sep 24 03:10:36 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Sep 24 03:10:36 2019 +0000
tree fabcd5033d359fb489c0567b6f77e08644a7d614
parent e836240cbb2f6612cd43aefa93b2cbbe6a7c73d7
parent b85e19905287022feec641b4d9c9c7879df0a1e5

Snap for 5895720 from b85e19905287022feec641b4d9c9c7879df0a1e5 to rvc-release

Change-Id: Ic394392aa5f734bb72f5ba45b4c4667f283ce7f3

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 d7afd32..bbcd3b4 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.getCurrentPageTaskView();
+                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();