From bcd9e60e5edda7b60ac4ba31c7903666f1bc9f61 Mon Sep 17 00:00:00 2001 From: JW Wang Date: Mon, 6 Jan 2020 15:44:07 +0800 Subject: [PATCH] Convert rollback type to string to improve logging Bug: 147204526 Test: atest StagedRollbackTest#testNativeWatchdogTriggersRollback Change-Id: I63303853ed2179fecd7037dd1e76a4d3653c3039 --- .../rollback/RollbackPackageHealthObserver.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java index 162a695463185..a0ef8cfec80f2 100644 --- a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java +++ b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java @@ -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);