am fca5677a: Merge "Add null check for package settings" into gingerbread

Merge commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391' into gingerbread-plus-aosp

* commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391':
  Add null check for package settings

1 files changed, 1 insertions, 1 deletions

diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index abf8b7cbf998..387f458a7106 100644
--- 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.