diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-09-16 14:09:28 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2013-09-16 14:35:25 -0700 |
| commit | 1003be9e626570ce3ca44baf9c60bad3c4438c8b (patch) | |
| tree | cabc3cc4d390a5bcd1fc457664eb78b367d56e7c /src | |
| parent | c05d313e5adf67f29a4fa2a08f44ff9f53b3d6e4 (diff) | |
| download | android_packages_apps_Trebuchet-1003be9e626570ce3ca44baf9c60bad3c4438c8b.tar.gz android_packages_apps_Trebuchet-1003be9e626570ce3ca44baf9c60bad3c4438c8b.tar.bz2 android_packages_apps_Trebuchet-1003be9e626570ce3ca44baf9c60bad3c4438c8b.zip | |
Fix NPE (issue 10708277)
Change-Id: I76cc74ae4e75bb9a0c1437c2f7d1c27b2fc6afd7
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 18 |
1 files changed, 5 insertions, 13 deletions
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() { |