commit 9cd7302d7df9a002d554e2aaf15bf535a822aa6a
author Winson Chung <winsonc@google.com> Fri Feb 14 21:01:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 21:01:09 2014 +0000
tree 366862dca2be377589e9ceb93b346ebb4f94de46
parent 249b8aa53dab9f51bef4be8c7bb347ac8a754c4b
parent 195dd27c8fcfb830c26d27df7d3c8d054139ee6e

am 195dd27c: am c7cfb790: am bc7d88ea: am 88416027: Merge "Fixing crash while reordering pages in OverviewMode." into jb-ub-now-jolly-elf

* commit '195dd27c8fcfb830c26d27df7d3c8d054139ee6e':
  Fixing crash while reordering pages in OverviewMode.

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 5ff80b8..a85065e 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1817,7 +1817,9 @@
                                 addView(mDragView, pageUnderPointIndex);
                                 onAddView(mDragView, pageUnderPointIndex);
                                 mSidePageHoverIndex = -1;
-                                mPageIndicator.setActiveMarker(getNextPage());
+                                if (mPageIndicator != null) {
+                                    mPageIndicator.setActiveMarker(getNextPage());
+                                }
                             }
                         };
                         postDelayed(mSidePageHoverRunnable, REORDERING_SIDE_PAGE_HOVER_TIMEOUT);