commit 603b8016d775f62d60d721ca43461f4ce88cc581
author Winson Chung <winsonc@google.com> Fri Feb 14 20:37:22 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:37:22 2014 +0000
tree d418e5262f8fb328b691e35fd06795ec430b7820
parent 6b132437a1e8716ebf8bd1e43d07c6c82973e2b9
parent d7797521f312697a8947938056b2f3807009a92c

am d7797521: am b88ae415: Fixing crash with invalid current page.

* commit 'd7797521f312697a8947938056b2f3807009a92c':
  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();
     }