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

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

Browse Source 
* commit 'aefd73d2b9f17a06f05346f302db1e393a7ece19':
  Try to avoid possible NPE
This commit is contained in:
Kenny Root
2012-09-13 08:40:06 -07:00
committed by Android Git Automerger
parent 2b28b37b20 aefd73d2b9
commit f972f2fa96
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/pm/PackageManagerService.java
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);
} }