diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-11 19:25:39 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-11 19:25:39 +0000 |
commit | 6129e4737cce1590f81393f384ec66efb6a220f8 (patch) | |
tree | ab1ea4407e539f75f1ba13e105a7f4f6781036e9 /quickstep/recents_ui_overrides/src | |
parent | 1a66df255adf0694dd0ef865f9b0479c11b14321 (diff) | |
parent | f0d2e0064e3c49f3e4922bd952718c6ca242f790 (diff) | |
download | android_packages_apps_Trebuchet-6129e4737cce1590f81393f384ec66efb6a220f8.tar.gz android_packages_apps_Trebuchet-6129e4737cce1590f81393f384ec66efb6a220f8.tar.bz2 android_packages_apps_Trebuchet-6129e4737cce1590f81393f384ec66efb6a220f8.zip |
Merge "Fix potential NPE in BackgroundAppState" into ub-launcher3-qt-dev
Diffstat (limited to 'quickstep/recents_ui_overrides/src')
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java index f1d6450a5..1c6696858 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java @@ -64,10 +64,12 @@ public class BackgroundAppState extends OverviewState { public ScaleAndTranslation getOverviewScaleAndTranslation(Launcher launcher) { // Initialize the recents view scale to what it would be when starting swipe up RecentsView recentsView = launcher.getOverviewPanel(); - if (recentsView.getTaskViewCount() == 0) { + int taskCount = recentsView.getTaskViewCount(); + if (taskCount == 0) { return super.getOverviewScaleAndTranslation(launcher); } - TaskView dummyTask = recentsView.getTaskViewAt(recentsView.getCurrentPage()); + TaskView dummyTask = recentsView.getTaskViewAt(Math.max(taskCount - 1, + recentsView.getCurrentPage())); return recentsView.getTempClipAnimationHelper().updateForFullscreenOverview(dummyTask) .getScaleAndTranslation(); } |