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

This commit is contained in:
Kenny Root
2012-09-13 08:38:26 -07:00
committed by Android (Google) Code Review

View File

@@ -4110,7 +4110,7 @@ public class PackageManagerService extends IPackageManager.Stub {
} }
} else if (!isForwardLocked(pkg) && !isExternal(pkg)) { } else if (!isForwardLocked(pkg) && !isExternal(pkg)) {
// Update native library dir if it starts with /data/data // Update native library dir if it starts with /data/data
if (nativeLibraryDir.getParent().startsWith(dataPathString)) { if (nativeLibraryDir.getPath().startsWith(dataPathString)) {
setInternalAppNativeLibraryPath(pkg, pkgSetting); setInternalAppNativeLibraryPath(pkg, pkgSetting);
nativeLibraryDir = new File(pkg.applicationInfo.nativeLibraryDir); nativeLibraryDir = new File(pkg.applicationInfo.nativeLibraryDir);
} }