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

Commit aa27b994 authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix deadlock between PackageManager and DisplayManager" into main am: 92e95adb 

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



Change-Id: Ia56af754ffc77eff879378af328c8a5e9d23c106
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0397776c 92e95adb

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

+19 −9
Original line number Diff line number Diff line
@@ -486,20 +486,30 @@ final class InstallPackageHelper { 
            pkgSetting.setLoadingProgress(1f);

        }



        // TODO: passes the package name as an argument in a message to the handler for V+

        //  so we don't need to rely on creating lambda objects so frequently.

        if (UpdateOwnershipHelper.hasValidOwnershipDenyList(pkgSetting)) {

            mPm.mHandler.post(() -> handleUpdateOwnerDenyList(pkgSetting));

        }

        return pkg;

    }



    private void handleUpdateOwnerDenyList(PackageSetting pkgSetting) {

        ArraySet<String> listItems = mUpdateOwnershipHelper.readUpdateOwnerDenyList(pkgSetting);

        if (listItems != null && !listItems.isEmpty()) {

            mUpdateOwnershipHelper.addToUpdateOwnerDenyList(pkgSetting.getPackageName(), listItems);

            mUpdateOwnershipHelper.addToUpdateOwnerDenyList(pkgSetting.getPackageName(),

                    listItems);

            SystemConfig config = SystemConfig.getInstance();

            synchronized (mPm.mLock) {

                for (String unownedPackage : listItems) {

                    PackageSetting unownedSetting = mPm.mSettings.getPackageLPr(unownedPackage);

                SystemConfig config = SystemConfig.getInstance();

                    if (unownedSetting != null

                            && config.getSystemAppUpdateOwnerPackageName(unownedPackage) == null) {

                        unownedSetting.setUpdateOwnerPackage(null);

                    }

                }

            }



        return pkg;

        }

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class UpdateOwnershipHelper { 


    private final Object mLock = new Object();



    private static boolean hasValidOwnershipDenyList(PackageSetting pkgSetting) {

    static boolean hasValidOwnershipDenyList(PackageSetting pkgSetting) {

        AndroidPackage pkg = pkgSetting.getPkg();

        // we're checking for uses-permission for these priv permissions instead of grant as we're

        // only considering system apps to begin with, so presumed to be granted.