Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391' into gingerbread-plus-aosp

* commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391':
  Add null check for package settings
This commit is contained in:
Kenny Root
2010-09-01 14:12:26 -07:00
committed by Android Git Automerger
parent 6fb81376b6 fca5677aee
commit 11d12f7efc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/PackageManagerService.java
View File

@@ -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.