commit 199c4825e2d64e3a5d8992155595462e75332cc7
author Joe Onorato <joeo@android.com> Tue Dec 08 13:36:48 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 08 13:36:48 2009 -0800
tree cb28e8b121f9c561e2a49f777b0cf3a92f7b6348
parent f8e6a80acd4e5558fdf7e0559f1043a2b183a8fa
parent bf173f11d27719af7a3c480ce84bb5b63e191fba

am bf173f11: Fix 2304151 - crash while installing apps

Merge commit 'bf173f11d27719af7a3c480ce84bb5b63e191fba' into eclair-mr2

* commit 'bf173f11d27719af7a3c480ce84bb5b63e191fba':
  Fix 2304151 - crash while installing apps

src/com/android/launcher2/AllAppsView.java

diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index fe8ded1..6d3ae47 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -1149,7 +1149,7 @@
             int[] labelIds = new int[count];
             mAllocLabelIds = Allocation.createSized(mRS, Element.USER_I32(mRS), count);
 
-            final int oldCount = mIcons.length;
+            final int oldCount = mRollo.mState.iconCount;
 
             System.arraycopy(mIcons, 0, icons, 0, oldCount);
             System.arraycopy(mIconIds, 0, iconIds, 0, oldCount);