From a7d7f79c4058bdf1508458341bd1c1cd4ff785b9 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Tue, 9 Feb 2010 13:16:02 -0800
Subject: [PATCH] Adding null check.

---
 services/java/com/android/server/PackageManagerService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 10bf8511932be..1cda2ff5ba1f2 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -2750,9 +2750,9 @@ class PackageManagerService extends IPackageManager.Stub {
                                     + 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);
                     }
                 }