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

Commit 26ac855b authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Fix re-installation via package uri-s 

It is allowed to install a package via a "package" URI. This means that
if a package with the same name is already installed (for any user), please
(re-)install it for the current user.

This was broken as mPackageURI.getPath() does not work for such package
URIs. This call is only needed when we need to show UI, but for package
URIs we don't even new UI, hence we can move it for the "content" path.

Test: atest CtsPackageInstallTestCases
Bug: 117768093
Change-Id: I58d3abde22ae0a77aabe5068680fd0148d799776
parent cd6dbf7e

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

+23 −22
Original line number Diff line number Diff line
@@ -83,6 +83,15 @@ public class InstallInstalling extends AlertActivity { 
        ApplicationInfo appInfo = getIntent()

                .getParcelableExtra(PackageUtil.INTENT_ATTR_APPLICATION_INFO);

        mPackageURI = getIntent().getData();



        if ("package".equals(mPackageURI.getScheme())) {

            try {

                getPackageManager().installExistingPackage(appInfo.packageName);

                launchSuccess();

            } catch (PackageManager.NameNotFoundException e) {

                launchFailure(PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null);

            }

        } else {

            final File sourceFile = new File(mPackageURI.getPath());

            PackageUtil.AppSnippet as = PackageUtil.getAppSnippet(this, appInfo, sourceFile);
@@ -106,14 +115,6 @@ public class InstallInstalling extends AlertActivity { 
            setupAlert();

            requireViewById(R.id.installing).setVisibility(View.VISIBLE);



        if ("package".equals(mPackageURI.getScheme())) {

            try {

                getPackageManager().installExistingPackage(appInfo.packageName);

                launchSuccess();

            } catch (PackageManager.NameNotFoundException e) {

                launchFailure(PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null);

            }

        } else {

            if (savedInstanceState != null) {

                mSessionId = savedInstanceState.getInt(SESSION_ID);

                mInstallId = savedInstanceState.getInt(INSTALL_ID);