From 0f001d3ee0a4db694029b1956fa5b901dcdde781 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 13 Sep 2012 08:35:38 -0700 Subject: [PATCH] Try to avoid possible NPE For some reason .getParent() appears to be returning null for a data directory. We don't need to use the parent; we can just use the path. Bug: 7151733 Change-Id: I5e17cc14fe53669882329d67d8a7b4ec35b81104 --- services/java/com/android/server/pm/PackageManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 8ce474aa13b6e..994429b0b5c9a 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -4108,7 +4108,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); }