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

Commit 84bb6e7b authored by Jackal Guo's avatar Jackal Guo
Browse files

Make PackageInstaller prompt properly 

After introducing the update owner, the privileged installers may need
user action to update an app. However, the install would abort because
PackageInstaller doesn't expect that. Need to revise PackageInstaller
to adopt the new mechanism.

Bug: 267712075
Test: atest CtsPackageInstallTestCases
Test: mannually install an app with update ownership via shell, and
      then try to update by a privileged installer.
Change-Id: Ifb9c41515753a124fc445cf352fb9e4dd55dad92
parent ee512d28

packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java

+4 −1
Original line number Diff line number Diff line
@@ -80,7 +80,10 @@ public class InstallStart extends Activity { 
        final int originatingUid = getOriginatingUid(sourceInfo);

        boolean isTrustedSource = false;

        if (sourceInfo != null && sourceInfo.isPrivilegedApp()) {

            isTrustedSource = intent.getBooleanExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, false);

            isTrustedSource = intent.getBooleanExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, false) || (

                    originatingUid != Process.INVALID_UID && checkPermission(

                            Manifest.permission.INSTALL_PACKAGES, -1 /* pid */, originatingUid)

                            == PackageManager.PERMISSION_GRANTED);

        }



        if (!isTrustedSource && originatingUid != Process.INVALID_UID) {

packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -297,6 +297,10 @@ public class PackageInstallerActivity extends AlertActivity { 
                return false;

            }

        }

        if (mSourceInfo != null && checkPermission(Manifest.permission.INSTALL_PACKAGES,

                -1 /* pid */, mSourceInfo.uid) == PackageManager.PERMISSION_GRANTED) {

            return false;

        }

        return true;

    }