Fix bug 2223769 - Uninstalling app causes NPE.
The check for whether there is anything in these lists should be sufficient. The other
variables don't need to also be checked.
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 6b4d3f4..d9017da 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -278,8 +278,6 @@
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 @@
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 @@
mAllAppsList.addPackage(context, packageName);
} else {
mAllAppsList.updatePackage(context, packageName);
- update = true;
}
}
@@ -345,7 +340,7 @@
}
});
}
- if (update || modified != null) {
+ if (modified != null) {
final ArrayList<ApplicationInfo> modifiedFinal = modified;
mHandler.post(new Runnable() {
public void run() {
@@ -353,7 +348,7 @@
}
});
}
- if (remove || removed != null) {
+ if (removed != null) {
final ArrayList<ApplicationInfo> removedFinal = removed;
mHandler.post(new Runnable() {
public void run() {