Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aefd73d2 authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

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

parents cae22d83 0f001d3e

services/java/com/android/server/pm/PackageManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

                    }