commit fcbc967136d7ea838a39f7ab29541a240ca2808c
author Shrinidhi Hegde <shrinidhihegde@google.com> Fri May 10 20:19:48 2024 +0000
committer Shrinidhi Hegde <shrinidhihegde@google.com> Fri May 10 20:19:48 2024 +0000
tree 42eb961f12cbadd793df1c0f32b322590ef3cc58
parent 43dc73188e63b383f3c331afea3909c39303bd00

Update rollback reason in logging.

Noticed that Rollback reason during boot loop was getting logged and
unknown because of a missing reason to string map. Updated that.

Test: manual
Bug: 291137901
Change-Id: I2ea6206d07099a413aeeca464e0d1ebd97c04840

services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java

diff --git a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java
index 93f26ae..c85ceac 100644
--- a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java
+++ b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java
@@ -642,6 +642,8 @@
                         .getPackages()
                         .get(0)
                         .getVersionRolledBackFrom();
+        Slog.i(TAG, "Rolling back high impact rollback for package: "
+                + firstRollback.getPackageName());
         rollbackPackage(sortedHighImpactRollbacks.get(0), firstRollback, rollbackReason);
     }
 

services/core/java/com/android/server/rollback/WatchdogRollbackLogger.java

diff --git a/services/core/java/com/android/server/rollback/WatchdogRollbackLogger.java b/services/core/java/com/android/server/rollback/WatchdogRollbackLogger.java
index 519c0ed..7fc0292 100644
--- a/services/core/java/com/android/server/rollback/WatchdogRollbackLogger.java
+++ b/services/core/java/com/android/server/rollback/WatchdogRollbackLogger.java
@@ -293,6 +293,8 @@
                 return "REASON_APP_NOT_RESPONDING";
             case WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_NATIVE_CRASH_DURING_BOOT:
                 return "REASON_NATIVE_CRASH_DURING_BOOT";
+            case WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_BOOT_LOOPING:
+                return "REASON_BOOT_LOOP";
             default:
                 return "UNKNOWN";
         }