commit d7797521f312697a8947938056b2f3807009a92c
author Winson Chung <winsonc@google.com> Tue Oct 29 17:26:32 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 29 17:26:32 2013 -0700
tree a4985e55040a4b0937587804861b0074b0c4a642
parent f59cfa88384926ada95dab59b568ceb6d055097b
parent b88ae4158d42edac85616a8db1dbda11609b9237

am b88ae415: Fixing crash with invalid current page.

* commit 'b88ae4158d42edac85616a8db1dbda11609b9237':
  Fixing crash with invalid current page.

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 1fee4c2..9b891e4 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -515,7 +515,7 @@
      * re-enable scrolling.
      */
     void stopScrolling() {
-        mCurrentPage = mNextPage;
+        mCurrentPage = getNextPage();
         forceFinishScroller();
     }