Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 188aa566 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

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

Merge commit '11d12f7e'

* commit '11d12f7e':
  Add null check for package settings
parents b3e6d570 11d12f7e

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

+1 −1
Original line number Diff line number Diff line
@@ -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.