summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-04-24 15:37:16 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-24 15:37:16 -0700
commit044c5695451db0b056fd0386901716c08015e0f1 (patch)
tree9f667b9854fbfee6b0178c89a875b81637708897 /src
parent0eb341ab22d45346ab7748bb05fab69fffeb0bd8 (diff)
parentd7e9e37cb7b253b4b68b8229e5baa7031b65d2e2 (diff)
downloadandroid_packages_apps_Trebuchet-044c5695451db0b056fd0386901716c08015e0f1.tar.gz
android_packages_apps_Trebuchet-044c5695451db0b056fd0386901716c08015e0f1.tar.bz2
android_packages_apps_Trebuchet-044c5695451db0b056fd0386901716c08015e0f1.zip
Merge "Fixing issue where ItemInfo had errant cell coordinates leading to an array-out-of-bounds exception. (Bug 6333784)"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/InstallShortcutReceiver.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/InstallShortcutReceiver.java b/src/com/android/launcher2/InstallShortcutReceiver.java
index 82fb3d154..eda82e098 100644
--- a/src/com/android/launcher2/InstallShortcutReceiver.java
+++ b/src/com/android/launcher2/InstallShortcutReceiver.java
@@ -174,8 +174,8 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
cellY = item.cellY;
spanX = item.spanX;
spanY = item.spanY;
- for (int x = cellX; x < cellX + spanX && x < xCount; x++) {
- for (int y = cellY; y < cellY + spanY && y < yCount; y++) {
+ for (int x = cellX; 0 <= x && x < cellX + spanX && x < xCount; x++) {
+ for (int y = cellY; 0 <= y && y < cellY + spanY && y < yCount; y++) {
occupied[x][y] = true;
}
}