commit 0f001d3ee0a4db694029b1956fa5b901dcdde781
author Kenny Root <kroot@google.com> Thu Sep 13 08:35:38 2012 -0700
committer Kenny Root <kroot@google.com> Thu Sep 13 08:36:49 2012 -0700
tree a3c2ec7a730777b2bd6654e0a90de1b5d7b53f0a
parent 568e3ebb5e7814fb68179a9755a686a0e1deec70

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

diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index 8ce474a..994429b 100644
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -4108,7 +4108,7 @@
                     }
                 } 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);
                     }