commit c7cfb79037986c261855d875d0f14c5cc9d38399
author Winson Chung <winsonc@google.com> Fri Feb 14 20:37:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:37:41 2014 +0000
tree 413e8e563dadf2c63f278dba574bd79f9dc3b096
parent c48aaa75b3e6a90e053f0e1cc8c161b8080fa04b
parent bc7d88eacb68a28d9fc9ef2064f8d7fdea8e4a36

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

* commit 'bc7d88eacb68a28d9fc9ef2064f8d7fdea8e4a36':
  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);