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

Commit aef5fcdc authored by Narayan Kamath's avatar Narayan Kamath
Browse files

Don't assume all system apps are bundled. 

Calling setBundledAppAbisAndRoots will end up
setting a path that points to /system/ if it's called
on a system app that was subsequently updated.

bug: 16208505

Change-Id: I0bf85e0341029b3d4d209a402d30c2ce357daaf2
parent d7e71641

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

+3 −1
Original line number Diff line number Diff line
@@ -4822,8 +4822,10 @@ public class PackageManagerService extends IPackageManager.Stub { 
        // Fix that up here.

        if (isSystemApp(pkg)) {

            PackageSetting ps = mSettings.mPackages.get(pkg.applicationInfo.packageName);

            if (!isUpdatedSystemApp(pkg)) {

                setBundledAppAbisAndRoots(pkg, ps);

            }

        }















        if (pkg.usesLibraries != null || pkg.usesOptionalLibraries != null) {















            final ArraySet<String> usesLibraryFiles = new ArraySet<>();