PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

am 504b5a04: am 418928e9: Fix bug 2223769 - Uninstalling app causes NPE.

Browse Source 
Merge commit '504b5a0488f2efb0abbfc68c89ea73119ca3e925' into eclair-mr2-plus-aosp

* commit '504b5a0488f2efb0abbfc68c89ea73119ca3e925':
  Fix bug 2223769 - Uninstalling app causes NPE.
This commit is contained in:
Joe Onorato
2009-11-19 19:02:44 -08:00
committed by Android Git Automerger
parent 7a51fbbfb5 504b5a0488
commit efffe8baf0
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/LauncherModel.java
+2 -7
View File
@@ -278,8 +278,6 @@ public class LauncherModel extends BroadcastReceiver {
ArrayList<ApplicationInfo> added = null; ArrayList<ApplicationInfo> added = null;
ArrayList<ApplicationInfo> removed = null; ArrayList<ApplicationInfo> removed = null;
ArrayList<ApplicationInfo> modified = null; ArrayList<ApplicationInfo> modified = null;
boolean update = false;
boolean remove = false;
synchronized (mLock) { synchronized (mLock) {
if (mBeforeFirstLoad) { if (mBeforeFirstLoad) {
@@ -298,11 +296,9 @@ public class LauncherModel extends BroadcastReceiver {
if (Intent.ACTION_PACKAGE_CHANGED.equals(action)) { if (Intent.ACTION_PACKAGE_CHANGED.equals(action)) {
mAllAppsList.updatePackage(context, packageName); mAllAppsList.updatePackage(context, packageName);
update = true;
} else if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) { } else if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) {
if (!replacing) { if (!replacing) {
mAllAppsList.removePackage(packageName); mAllAppsList.removePackage(packageName);
remove = true;
} }
// else, we are replacing the package, so a PACKAGE_ADDED will be sent // else, we are replacing the package, so a PACKAGE_ADDED will be sent
// later, we will update the package at this time // later, we will update the package at this time
@@ -311,7 +307,6 @@ public class LauncherModel extends BroadcastReceiver {
mAllAppsList.addPackage(context, packageName); mAllAppsList.addPackage(context, packageName);
} else { } else {
mAllAppsList.updatePackage(context, packageName); 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; final ArrayList<ApplicationInfo> modifiedFinal = modified;
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
public void run() { public void run() {
@@ -353,7 +348,7 @@ public class LauncherModel extends BroadcastReceiver {
} }
}); });
} }
if (remove || removed != null) { if (removed != null) {
final ArrayList<ApplicationInfo> removedFinal = removed; final ArrayList<ApplicationInfo> removedFinal = removed;
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
public void run() { public void run() {