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

Commit ec97460a authored by Todd Kennedy's avatar Todd Kennedy Committed by Automerger Merge Worker
Browse files

Merge "If we ever rescan a stub, make sure to uncompress it" into sc-dev am:... 

Merge "If we ever rescan a stub, make sure to uncompress it" into sc-dev am: 5f28ee3e am: 8c7a951c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14686829

Change-Id: I15f6fbbf666b7e72ff7d6975ed9f4dd46553d930
parents f317cb27 8c7a951c

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

+6 −1
Original line number Diff line number Diff line
@@ -6762,7 +6762,12 @@ public class PackageManagerService extends IPackageManager.Stub 
                        mSettings.enableSystemPackageLPw(packageName);















                        try {













                            scanPackageTracedLI(scanFile, reparseFlags, rescanFlags, 0, null);













                            final AndroidPackage newPkg = scanPackageTracedLI(













                                    scanFile, reparseFlags, rescanFlags, 0, null);













                            // We rescanned a stub, add it to the list of stubbed system packages













                            if (newPkg.isStub()) {













                                stubSystemApps.add(packageName);













                            }















                        } catch (PackageManagerException e) {















                            Slog.e(TAG, "Failed to parse original system package: "















                                    + e.getMessage());