diff options
| author | Kenny Root <kroot@google.com> | 2012-09-13 08:38:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-13 08:38:26 -0700 |
| commit | aefd73d2b9f17a06f05346f302db1e393a7ece19 (patch) | |
| tree | 4a8ce90499ea8e97b8079c6110913f0809da4a79 | |
| parent | cae22d83a7225c38ef6f51723e13d5741d1cd69b (diff) | |
| parent | 0f001d3ee0a4db694029b1956fa5b901dcdde781 (diff) | |
| download | frameworks_base-aefd73d2b9f17a06f05346f302db1e393a7ece19.zip frameworks_base-aefd73d2b9f17a06f05346f302db1e393a7ece19.tar.gz frameworks_base-aefd73d2b9f17a06f05346f302db1e393a7ece19.tar.bz2 | |
Merge "Try to avoid possible NPE" into jb-mr1-dev
| -rw-r--r-- | services/java/com/android/server/pm/PackageManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index ba63efd..c7300b6 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -4110,7 +4110,7 @@ public class PackageManagerService extends IPackageManager.Stub { } } 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); } |