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

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

Merge "Parent's canonical path; not parent of canonical"

parents 04ee7956 5832ead8

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

+2 −2
Original line number Diff line number Diff line
@@ -3326,7 +3326,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
        if (pkg.applicationInfo.nativeLibraryDir != null) {

            try {

                final File nativeLibraryDir = new File(pkg.applicationInfo.nativeLibraryDir);

                final String dataPathString = dataPath.getCanonicalFile().getPath();

                final String dataPathString = dataPath.getCanonicalPath();



                if (isSystemApp(pkg) && !isUpdatedSystemApp(pkg)) {

                    /*
@@ -3340,7 +3340,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                        Log.i(TAG, "removed obsolete native libraries for system package "

                                + path);

                    }

                } else if (nativeLibraryDir.getCanonicalFile().getParent()

                } else if (nativeLibraryDir.getParentFile().getCanonicalPath()

                        .equals(dataPathString)) {

                    /*

                     * Make sure the native library dir isn't a symlink to