Merge "Add null check for package settings" into gingerbread

2010-09-01 14:09:01 -07:00
parent e34fe69e66 9ee9274e5e
commit fca5677aee
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -2603,7 +2603,7 @@ class PackageManagerService extends IPackageManager.Stub {
        }
        // First check if this is a system package that may involve an update
        if (updatedPkg != null && (parseFlags&PackageParser.PARSE_IS_SYSTEM) != 0) {
-            if (!ps.codePath.equals(scanFile)) {
+            if (ps != null && !ps.codePath.equals(scanFile)) {
                // The path has changed from what was last scanned...  check the
                // version of the new path against what we have stored to determine
                // what to do.