commit bc219c3c127cb74cf4fe578f05022b745da921b8
author The Android Open Source Project <initial-contribution@android.com> Mon Mar 09 11:52:14 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon Mar 09 11:52:14 2009 -0700
tree a3df41414cc358f459b12cab90ae7a35dee7b618
parent 1ff70f7f72aa14ff565278337b668a76cc91fb2a

auto import from //branches/cupcake/...@137197

src/com/android/launcher/Launcher.java

diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index e88e55e..9656983 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -151,7 +151,7 @@
     // Type: long
     private static final String RUNTIME_STATE_PENDING_FOLDER_RENAME_ID = "launcher.rename_folder_id";
 
-    private static LauncherModel sModel;
+    private static final LauncherModel sModel = new LauncherModel();
 
     private static Bitmap sWallpaper;
 
@@ -212,10 +212,6 @@
         checkForLocaleChange();
         setWallpaperDimension();
 
-        if (sModel == null) {
-            sModel = new LauncherModel();
-        }
-
         setContentView(R.layout.launcher);
         setupViews();
 
@@ -1742,6 +1738,7 @@
                 }
             }
             removeDialog(DIALOG_CREATE_SHORTCUT);
+            sModel.dropApplicationCache();
             if (!reloadWorkspace) {
                 sModel.loadApplications(false, Launcher.this, false);
             } else {