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

Commit 7a5eeb1a authored by Richard Uhler's avatar Richard Uhler
Browse files

Don't restore installer when rolling back APEX 

Because the package manager doesn't currently support getting the
installer package for an apex.

Test: atest RollbackTest
Bug: 112431924

Change-Id: Ib53a54a3d089458a8e09f27bdf6eca2091995593
parent b502afb1

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

+11 −6
Original line number Diff line number Diff line
@@ -331,6 +331,10 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
            for (PackageRollbackInfo info : data.packages) {

                PackageInstaller.SessionParams params = new PackageInstaller.SessionParams(

                        PackageInstaller.SessionParams.MODE_FULL_INSTALL);

                // TODO: We can't get the installerPackageName for apex

                // (b/123920130). Is it okay to ignore the installer package

                // for apex?

                if (!info.isApex()) {

                    String installerPackageName = pm.getInstallerPackageName(info.getPackageName());

                    if (installerPackageName == null) {

                        sendFailure(statusReceiver, RollbackManager.STATUS_FAILURE,
@@ -338,6 +342,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
                        return;

                    }

                    params.setInstallerPackageName(installerPackageName);

                }

                params.setAllowDowngrade(true);

                if (data.isStaged()) {

                    params.setStaged();