am bdc5a45d: am 3ecbd81f: Still trying to fix 2320348 - Launcher2 crashed: AIOOBE at com.android.launcher2.AllAppsView.removeApp

Merge commit 'bdc5a45de6708c241a414805bdec65428c9ddd88' into eclair-mr2-plus-aosp

* commit 'bdc5a45de6708c241a414805bdec65428c9ddd88':
  Still trying to fix 2320348 - Launcher2 crashed: AIOOBE at com.android.launcher2.AllAppsView$RolloRS.removeApp
This commit is contained in:
Joe Onorato
2009-12-13 12:34:31 -08:00
committed by Android Git Automerger

View File

@@ -658,11 +658,7 @@ public class AllAppsView extends RSSurfaceView
public void setApps(ArrayList<ApplicationInfo> list) {
mAllAppsList = list;
if (mRollo != null) {
if (mRollo.mHasSurface) {
mRollo.setApps(list);
} else {
mRollo.mAppsDirty = true;
}
mRollo.setApps(list);
}
mLocks &= ~LOCK_ICONS_PENDING;
}
@@ -1084,7 +1080,13 @@ public class AllAppsView extends RSSurfaceView
mState.iconCount = count;
for (int i=0; i < mState.iconCount; i++) {
createAppIconAllocations(i, list.get(i));
uploadAppIcon(i, list.get(i));
}
if (mHasSurface) {
for (int i=0; i < mState.iconCount; i++) {
uploadAppIcon(i, list.get(i));
}
} else {
mRollo.mAppsDirty = true;
}
saveAppsList();
}