commit 88416027a3740dacbd97bd2264f22ba51f5c7e21
author Winson Chung <winsonc@google.com> Thu Nov 07 18:51:57 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 07 18:51:57 2013 +0000
tree d9249034c4f6eeb5a64f83e042e6d51e69f67c09
parent c82d2622bc7305fd3545fe7df97a30187283113f
parent 876a619b11bfdf583465b0cc2be67266436558b9

Merge "Fixing crash while reordering pages in OverviewMode." into jb-ub-now-jolly-elf

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);