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

Convert rollback type to string to improve logging

Browse Source 
Bug: 147204526
Test: atest StagedRollbackTest#testNativeWatchdogTriggersRollback
Change-Id: I63303853ed2179fecd7037dd1e76a4d3653c3039
This commit is contained in:
JW Wang
2020-01-06 15:44:07 +08:00
parent 9e87abdcda
commit bcd9e60e5e
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,9 +333,24 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve
return rollbackId;
}
private static String rollbackTypeToString(int type) {
switch (type) {
case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_INITIATE:
return "ROLLBACK_INITIATE";
case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS:
return "ROLLBACK_SUCCESS";
case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE:
return "ROLLBACK_FAILURE";
case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_BOOT_TRIGGERED:
return "ROLLBACK_BOOT_TRIGGERED";
default:
return "UNKNOWN";
}
}
private static void logEvent(@Nullable VersionedPackage moduleMetadataPackage, int type,
int rollbackReason, @NonNull String failingPackageName) {
Slog.i(TAG, "Watchdog event occurred of type: " + type);
Slog.i(TAG, "Watchdog event occurred of type: " + rollbackTypeToString(type));
if (moduleMetadataPackage != null) {
StatsLog.logWatchdogRollbackOccurred(type, moduleMetadataPackage.getPackageName(),
moduleMetadataPackage.getVersionCode(), rollbackReason, failingPackageName);