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

Commit 964e4170 authored by Patrick Baumann's avatar Patrick Baumann Committed by Automerger Merge Worker
Browse files

Merge "Fix to allow self-updates without user action." into sc-dev am: 563dcd5c 

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

Change-Id: I9783420476402dd4e5b0e9c836c862bc7542cb61
parents b7e6decf 563dcd5c

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

+5 −5
Original line number Diff line number Diff line
@@ -943,14 +943,14 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                == PackageManager.PERMISSION_GRANTED);

        final int targetPackageUid = mPm.getPackageUid(packageName, 0, userId);

        final boolean isUpdate = targetPackageUid != -1;

        final InstallSourceInfo installSourceInfo = isUpdate

        final InstallSourceInfo existingInstallSourceInfo = isUpdate

                ? mPm.getInstallSourceInfo(packageName)

                : null;

        final String installerPackageName = installSourceInfo != null

                ? installSourceInfo.getInstallingPackageName()

        final String existingInstallerPackageName = existingInstallSourceInfo != null

                ? existingInstallSourceInfo.getInstallingPackageName()

                : null;

        final boolean isInstallerOfRecord = isUpdate

                && Objects.equals(installerPackageName, getInstallerPackageName());

                && Objects.equals(existingInstallerPackageName, getInstallerPackageName());

        final boolean isSelfUpdate = targetPackageUid == mInstallerUid;

        final boolean isPermissionGranted = isInstallPermissionGranted

                || (isUpdatePermissionGranted && isUpdate)
@@ -967,7 +967,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            return USER_ACTION_NOT_NEEDED;

        }



        if (mPm.isInstallDisabledForPackage(installerPackageName, mInstallerUid, userId)) {

        if (mPm.isInstallDisabledForPackage(getInstallerPackageName(), mInstallerUid, userId)) {

            // show the installer to account for device poslicy or unknown sources use cases

            return USER_ACTION_REQUIRED;

        }