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

Commit ec41d7ab authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - Don't crash uninstalling updates to system apps" into lmp-preview-dev

parents 0b723fdb d9a6475c

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

+6 −1
Original line number Diff line number Diff line
@@ -6140,8 +6140,13 @@ public class PackageManagerService extends IPackageManager.Stub { 
        }

        final String nativeLibraryPath = (new File(libDir, apkName)).getPath();

        pkg.applicationInfo.nativeLibraryDir = nativeLibraryPath;

        // pkgSetting might be null during rescan following uninstall of updates

        // to a bundled app, so accommodate that possibility.  The settings in

        // that case will be established later from the parsed package.

        if (pkgSetting != null) {

            pkgSetting.nativeLibraryPathString = nativeLibraryPath;

        }

    }















    // Deduces the required ABI of an upgraded system app.















    private void setInternalAppAbi(PackageParser.Package pkg, PackageSetting pkgSetting) {