summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-12-12 16:16:39 -0800
committerAdam Cohen <adamcohen@google.com>2013-12-12 16:16:55 -0800
commit4de0974c460ce6439cce7931fb0ba945095a4b94 (patch)
tree475dfdb50d4dedffae1b81dcb30c0f9a02fc56f9 /src/com/android/launcher3/Workspace.java
parentae4409dea97d03f0f0a9195ab648188efa2b5cc1 (diff)
downloadandroid_packages_apps_Trebuchet-4de0974c460ce6439cce7931fb0ba945095a4b94.tar.gz
android_packages_apps_Trebuchet-4de0974c460ce6439cce7931fb0ba945095a4b94.tar.bz2
android_packages_apps_Trebuchet-4de0974c460ce6439cce7931fb0ba945095a4b94.zip
Fix NPE from feedback (issue 12106858)
Change-Id: I63f7f73b85d4c1652d1e722f94c51b567a83cc6b
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 72399e4ec..52420b73b 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1666,7 +1666,7 @@ public class Workspace extends SmoothPagedView
cl.setOverscrollTransformsDirty(true);
}
} else {
- if (mOverscrollTransformsSet) {
+ if (mOverscrollTransformsSet && getChildCount() > 0) {
mOverscrollTransformsSet = false;
((CellLayout) getChildAt(0)).resetOverscrollTransforms();
((CellLayout) getChildAt(getChildCount() - 1)).resetOverscrollTransforms();