From b059e2f6d0d7f3b68e304a8ecb79aebbfd5112c3 Mon Sep 17 00:00:00 2001 From: JW Wang Date: Tue, 31 Dec 2019 15:58:31 +0800 Subject: [PATCH] Use PackageRollbackInfo#getVersionRolledBackFrom to simplify code (2/n) PackageRollbackInfo#getVersionRolledBackFrom returns a VersionedPackage which contains a version code. No need to query the version code from the package manager. Bug: 147028082 Test: atest StagedRollbackTest Change-Id: I769e726183ee99bb9e8c7576bb8b6c21a75fe2ff --- .../RollbackPackageHealthObserver.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java index 59c1b4e2f0fb1..9dab6a1c05107 100644 --- a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java +++ b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java @@ -357,15 +357,6 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve } } - private VersionedPackage getVersionedPackage(String packageName) { - try { - return new VersionedPackage(packageName, mContext.getPackageManager().getPackageInfo( - packageName, 0 /* flags */).getLongVersionCode()); - } catch (PackageManager.NameNotFoundException e) { - return null; - } - } - /** * Rolls back the session that owns {@code failedPackage} * @@ -428,14 +419,8 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve List rollbacks = rollbackManager.getAvailableRollbacks(); for (RollbackInfo rollback : rollbacks) { - String samplePackageName = rollback.getPackages().get(0).getPackageName(); - VersionedPackage sampleVersionedPackage = getVersionedPackage(samplePackageName); - if (sampleVersionedPackage == null) { - Slog.e(TAG, "Failed to rollback " + samplePackageName); - continue; - } - rollbackPackage(rollback, sampleVersionedPackage, - PackageWatchdog.FAILURE_REASON_NATIVE_CRASH); + VersionedPackage sample = rollback.getPackages().get(0).getVersionRolledBackFrom(); + rollbackPackage(rollback, sample, PackageWatchdog.FAILURE_REASON_NATIVE_CRASH); } }