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

Commit f70b45f9 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "also verify existence of a package" into oc-mr1-dev am: 8cfb2f63 am: 9de79308"

parents d0cdeb4d 32889f4d
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -2711,8 +2711,14 @@ public class PackageManagerService extends IPackageManager.Stub
                        // Actual deletion of code and data will be handled by later
                        // reconciliation step
                    } else {
                        final PackageSetting disabledPs = mSettings.getDisabledSystemPkgLPr(ps.name);
                        if (disabledPs.codePath == null || !disabledPs.codePath.exists()) {
                        // we still have a disabled system package, but, it still might have
                        // been removed. check the code path still exists and check there's
                        // still a package. the latter can happen if an OTA keeps the same
                        // code path, but, changes the package name.
                        final PackageSetting disabledPs =
                                mSettings.getDisabledSystemPkgLPr(ps.name);
                        if (disabledPs.codePath == null || !disabledPs.codePath.exists()
                                || disabledPs.pkg == null) {
                            possiblyDeletedUpdatedSystemApps.add(ps.name);
                        }
                    }