Adding null check.

diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 10bf851..1cda2ff 100644 (file)
--- 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);
                     }
                 }