diff options
author | Adam Cohen <adamcohen@google.com> | 2011-03-22 13:54:11 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2011-03-22 13:54:11 -0700 |
commit | 71a954640279e519a8471bf2249bfd6f6c713d1a (patch) | |
tree | 19b3d60e7dd535e97637600b7a927bf8953b21bf /src/com/android/launcher2/LauncherModel.java | |
parent | 097eb0a7511d2a645a32cc9e65a322efa54c08dd (diff) | |
download | android_packages_apps_Trebuchet-71a954640279e519a8471bf2249bfd6f6c713d1a.tar.gz android_packages_apps_Trebuchet-71a954640279e519a8471bf2249bfd6f6c713d1a.tar.bz2 android_packages_apps_Trebuchet-71a954640279e519a8471bf2249bfd6f6c713d1a.zip |
Fix launcher crash, bug: 3368489
Change-Id: I8b693d9ea6b4ef58ee1141e8f61b3fede134606b
Diffstat (limited to 'src/com/android/launcher2/LauncherModel.java')
-rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index c09874901..e432733c0 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -91,9 +91,6 @@ public class LauncherModel extends BroadcastReceiver { private AllAppsList mAllAppsList; // only access in worker thread private IconCache mIconCache; - final ArrayList<ItemInfo> mItems = new ArrayList<ItemInfo>(); - final ArrayList<LauncherAppWidgetInfo> mAppWidgets = new ArrayList<LauncherAppWidgetInfo>(); - final HashMap<Long, FolderInfo> mFolders = new HashMap<Long, FolderInfo>(); private Bitmap mDefaultIcon; @@ -522,9 +519,6 @@ public class LauncherModel extends BroadcastReceiver { mLoaderTask.stopLocked(); } } - mItems.clear(); - mAppWidgets.clear(); - mFolders.clear(); } /** @@ -540,6 +534,10 @@ public class LauncherModel extends BroadcastReceiver { private boolean mStopped; private boolean mLoadAndBindStepFinished; + final ArrayList<ItemInfo> mItems = new ArrayList<ItemInfo>(); + final ArrayList<LauncherAppWidgetInfo> mAppWidgets = new ArrayList<LauncherAppWidgetInfo>(); + final HashMap<Long, FolderInfo> mFolders = new HashMap<Long, FolderInfo>(); + LoaderTask(Context context, boolean isLaunching) { mContext = context; mIsLaunching = isLaunching; @@ -1294,6 +1292,7 @@ public class LauncherModel extends BroadcastReceiver { Log.d(TAG, "mLoaderTask.mIsLaunching=" + mIsLaunching); Log.d(TAG, "mLoaderTask.mStopped=" + mStopped); Log.d(TAG, "mLoaderTask.mLoadAndBindStepFinished=" + mLoadAndBindStepFinished); + Log.d(TAG, "mItems size=" + mItems.size()); } } @@ -1797,7 +1796,6 @@ public class LauncherModel extends BroadcastReceiver { ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.added", mAllAppsList.added); ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.removed", mAllAppsList.removed); ApplicationInfo.dumpApplicationInfoList(TAG, "mAllAppsList.modified", mAllAppsList.modified); - Log.d(TAG, "mItems size=" + mItems.size()); if (mLoaderTask != null) { mLoaderTask.dumpState(); } else { |