Fixing crash due to grabbing oob screen index. (Bug 10114488)

Change-Id: I9e0c3d9bfcf96f092260a82b930b7ea728b6e98d

1 files changed, 5 insertions, 5 deletions

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 2d23f362f..9424eef73 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3717,15 +3717,15 @@ public class Workspace extends SmoothPagedView
             final int page = getNextPage() +
                        (direction == DragController.SCROLL_LEFT ? -1 : 1);
 
-            // Ensure that we are not dragging over to the custom content screen
-            if (getScreenIdForPageIndex(page) == CUSTOM_CONTENT_SCREEN_ID) {
-                return false;
-            }
-
             // We always want to exit the current layout to ensure parity of enter / exit
             setCurrentDropLayout(null);
 
             if (0 <= page && page < getChildCount()) {
+                // Ensure that we are not dragging over to the custom content screen
+                if (getScreenIdForPageIndex(page) == CUSTOM_CONTENT_SCREEN_ID) {
+                    return false;
+                }
+
                 CellLayout layout = (CellLayout) getChildAt(page);
                 setCurrentDragOverlappingLayout(layout);