From 1003be9e626570ce3ca44baf9c60bad3c4438c8b Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 16 Sep 2013 14:09:28 -0700
Subject: Fix NPE (issue 10708277)

Change-Id: I76cc74ae4e75bb9a0c1437c2f7d1c27b2fc6afd7
---
 src/com/android/launcher3/Workspace.java | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'src/com/android/launcher3/Workspace.java')

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 09f37c42a..eed5b23ce 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1704,19 +1704,11 @@ public class Workspace extends SmoothPagedView
     protected void getOverviewModePages(int[] range) {
         int count = mScreenOrder.size();
 
-        int start = -1;
-        int end = -1;
-        //
-        for (int i = 0; i < count; i++) {
-            if (start < 0 && mScreenOrder.get(i) >= 0) {
-                start = i;
-            }
-            if (start >=0 && mScreenOrder.get(i) >= 0) {
-                end = i;
-            }
-        }
-        range[0] = start;
-        range[1] = end;
+        int start = hasCustomContent() ? 1 : 0;
+        int end = getChildCount() - 1;
+
+        range[0] = Math.max(0, Math.min(start, getChildCount() - 1));
+        range[1] = Math.max(0,  end);
      }
 
     protected void onStartReordering() {
-- 
cgit v1.2.3