Merge "Try to avoid possible NPE" into jb-mr1-dev

kruton · Android (Google) Code Review · commit aefd73d2b9f1 · 2012-09-13T08:38:26.000-07:00
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
@@ -4110,7 +4110,7 @@ private PackageParser.Package scanPackageLI(PackageParser.Package pkg,
                     }
                 } else if (!isForwardLocked(pkg) && !isExternal(pkg)) {
                     // Update native library dir if it starts with /data/data
-                    if (nativeLibraryDir.getParent().startsWith(dataPathString)) {
+                    if (nativeLibraryDir.getPath().startsWith(dataPathString)) {
                         setInternalAppNativeLibraryPath(pkg, pkgSetting);
                         nativeLibraryDir = new File(pkg.applicationInfo.nativeLibraryDir);
                     }

Original file line number	Diff line number	Diff line change
`@@ -4110,7 +4110,7 @@ private PackageParser.Package scanPackageLI(PackageParser.Package pkg,`
`4110`	`4110`	`}`
`4111`	`4111`	`} else if (!isForwardLocked(pkg) && !isExternal(pkg)) {`
`4112`	`4112`	`// Update native library dir if it starts with /data/data`
`4113`		`- if (nativeLibraryDir.getParent().startsWith(dataPathString)) {`
	`4113`	`+ if (nativeLibraryDir.getPath().startsWith(dataPathString)) {`
`4114`	`4114`	`setInternalAppNativeLibraryPath(pkg, pkgSetting);`
`4115`	`4115`	`nativeLibraryDir = new File(pkg.applicationInfo.nativeLibraryDir);`
`4116`	`4116`	`}`