diff options
author | Joe Onorato <joeo@android.com> | 2009-11-19 19:02:44 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-19 19:02:44 -0800 |
commit | efffe8baf0531166202df862d5ce5191529627ee (patch) | |
tree | 8d66158e0bca6d4cef5751e88c72303a38d0d183 | |
parent | 7a51fbbfb55c30921f0677b84483ef030e397d6f (diff) | |
parent | 504b5a0488f2efb0abbfc68c89ea73119ca3e925 (diff) | |
download | android_packages_apps_Trebuchet-efffe8baf0531166202df862d5ce5191529627ee.tar.gz android_packages_apps_Trebuchet-efffe8baf0531166202df862d5ce5191529627ee.tar.bz2 android_packages_apps_Trebuchet-efffe8baf0531166202df862d5ce5191529627ee.zip |
am 504b5a04: am 418928e9: Fix bug 2223769 - Uninstalling app causes NPE.
Merge commit '504b5a0488f2efb0abbfc68c89ea73119ca3e925' into eclair-mr2-plus-aosp
* commit '504b5a0488f2efb0abbfc68c89ea73119ca3e925':
Fix bug 2223769 - Uninstalling app causes NPE.
-rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index 6b4d3f4a4..d9017dab6 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -278,8 +278,6 @@ public class LauncherModel extends BroadcastReceiver { ArrayList<ApplicationInfo> added = null; ArrayList<ApplicationInfo> removed = null; ArrayList<ApplicationInfo> modified = null; - boolean update = false; - boolean remove = false; synchronized (mLock) { if (mBeforeFirstLoad) { @@ -298,11 +296,9 @@ public class LauncherModel extends BroadcastReceiver { if (Intent.ACTION_PACKAGE_CHANGED.equals(action)) { mAllAppsList.updatePackage(context, packageName); - update = true; } else if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) { if (!replacing) { mAllAppsList.removePackage(packageName); - remove = true; } // else, we are replacing the package, so a PACKAGE_ADDED will be sent // later, we will update the package at this time @@ -311,7 +307,6 @@ public class LauncherModel extends BroadcastReceiver { mAllAppsList.addPackage(context, packageName); } else { mAllAppsList.updatePackage(context, packageName); - update = true; } } @@ -345,7 +340,7 @@ public class LauncherModel extends BroadcastReceiver { } }); } - if (update || modified != null) { + if (modified != null) { final ArrayList<ApplicationInfo> modifiedFinal = modified; mHandler.post(new Runnable() { public void run() { @@ -353,7 +348,7 @@ public class LauncherModel extends BroadcastReceiver { } }); } - if (remove || removed != null) { + if (removed != null) { final ArrayList<ApplicationInfo> removedFinal = removed; mHandler.post(new Runnable() { public void run() { |