diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-09-24 01:11:24 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-09-24 01:11:24 +0000 |
commit | 8ddc17f325c54598473a3f0cf726358a1a8619c7 (patch) | |
tree | 87bc88c0eb8596bf90eda5e30ddd23595579c54e | |
parent | b5a9b67fcacec3f3d4191bbf67c9315c9cdb23a3 (diff) | |
parent | d2d58656a4ac1da8580c3636a681f36cba0c1ba9 (diff) | |
download | android_packages_apps_Trebuchet-8ddc17f325c54598473a3f0cf726358a1a8619c7.tar.gz android_packages_apps_Trebuchet-8ddc17f325c54598473a3f0cf726358a1a8619c7.tar.bz2 android_packages_apps_Trebuchet-8ddc17f325c54598473a3f0cf726358a1a8619c7.zip |
Snap for 5895359 from d2d58656a4ac1da8580c3636a681f36cba0c1ba9 to qt-qpr1-release
Change-Id: I05de7323b6e2ab3617eb0e14e30467c67a4be797
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java | 4 |
1 files changed, 4 insertions, 0 deletions
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 25cc33df0..36eb8a13b 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 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe 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(); |