From a7d18bbe14ba7a2cc454395c0ffddedc8ad29d17 Mon Sep 17 00:00:00 2001 From: Richard Uhler Date: Wed, 6 Feb 2019 11:58:17 +0000 Subject: Don't fail rollback for missing installer packages. There is no need to preserve the installer package if there isn't any in the first place. Bug: 112431924 Test: adb install --enable-rollback RollbackTestAppAv2.apk adb shell pm rollback-app com.android.tests.rollback.testapp.A Change-Id: I3c640866ca14dd3cdef5e334de7eee2176f632bf --- .../com/android/server/rollback/RollbackManagerServiceImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java index 27f7bcf36ddb..e75f8a016104 100644 --- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java +++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java @@ -339,12 +339,9 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { // for apex? if (!info.isApex()) { String installerPackageName = pm.getInstallerPackageName(info.getPackageName()); - if (installerPackageName == null) { - sendFailure(statusReceiver, RollbackManager.STATUS_FAILURE, - "Cannot find installer package"); - return; + if (installerPackageName != null) { + params.setInstallerPackageName(installerPackageName); } - params.setInstallerPackageName(installerPackageName); } params.setAllowDowngrade(true); if (data.isStaged()) { -- cgit v1.2.3-59-g8ed1b