Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use PackageRollbackInfo#getVersionRolledBackFrom to simplify code (2/n)

Browse Source 
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
This commit is contained in:
JW Wang
2019-12-31 15:58:31 +08:00
parent 8108251a87
commit b059e2f6d0
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java
View File

@@ -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<RollbackInfo> 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);
}
}