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
committerDanesh M <daneshm90@gmail.com>2014-06-06 22:54:22 -0700
commit184854625a903641da354e5bcdec544f3ebccbcf (patch)
tree059a40e7f66750518d5b7703e9581198ef7753e0 /src/com/android/launcher3/Workspace.java
parentc0971929e4c9279b461a86f2e5e152d5bf10268d (diff)
downloadandroid_packages_apps_Trebuchet-184854625a903641da354e5bcdec544f3ebccbcf.tar.gz
android_packages_apps_Trebuchet-184854625a903641da354e5bcdec544f3ebccbcf.tar.bz2
android_packages_apps_Trebuchet-184854625a903641da354e5bcdec544f3ebccbcf.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 d2c9d3e7e..91aadb30a 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1753,7 +1753,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();