commit f1a972924e1f8075e8fb247ac84cc10da9cde1d4
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 03 00:45:29 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 03 00:45:29 2018 +0000
tree 196636d9751c69873e667fd765a3aec42982bca0
parent a76751cd9aec816429c4e3d63a553db1e96875f2
parent 94262dedb735cef98d1323ba883dd2cf599339a6

[automerger] Skip snapping to page when there are no pages am: 94262dedb7

Change-Id: Ic70eff4797fe6ec3edea5ec861141e8ae7b8589e

quickstep/src/com/android/quickstep/QuickScrubController.java

diff --git a/quickstep/src/com/android/quickstep/QuickScrubController.java b/quickstep/src/com/android/quickstep/QuickScrubController.java
index adc245b..ae7de87 100644
--- a/quickstep/src/com/android/quickstep/QuickScrubController.java
+++ b/quickstep/src/com/android/quickstep/QuickScrubController.java
@@ -106,7 +106,7 @@
         };
         int snapDuration = Math.abs(page - mRecentsView.getPageNearestToCenterOfScreen())
                 * QUICKSCRUB_END_SNAP_DURATION_PER_PAGE;
-        if (mRecentsView.snapToPage(page, snapDuration)) {
+        if (mRecentsView.getChildCount() > 0 && mRecentsView.snapToPage(page, snapDuration)) {
             // Settle on the page then launch it
             mRecentsView.setNextPageSwitchRunnable(launchTaskRunnable);
         } else {