commit a7d7f79c4058bdf1508458341bd1c1cd4ff785b9
author Makoto Onuki <omakoto@google.com> Tue Feb 09 13:16:02 2010 -0800
committer Makoto Onuki <omakoto@google.com> Wed Feb 10 12:16:29 2010 -0800
tree db0dfca7ddff76c74e1954530d569fdbec10f854
parent 2fe23de8e3af6ef9e54c57e981c7d9d0e62e5299

Adding null check.

services/java/com/android/server/PackageManagerService.java

diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 10bf851..1cda2ff 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -2750,9 +2750,9 @@
                                     + pkgSetting.name;
                                 reportSettingsProblem(Log.WARN, msg);
                             }
+                            // And now uninstall the old package.
+                            mInstaller.remove(pkgSetting.origPackage.name, useEncryptedFSDir);
                         }
-                        // And now uninstall the old package.
-                        mInstaller.remove(pkgSetting.origPackage.name, useEncryptedFSDir);
                         mSettings.removePackageLP(pkgSetting.origPackage.name);
                     }
                 }