summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-05-31 14:47:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-31 14:47:02 +0000
commit4a3c2febcf72d93dd10d61ac91170c4bf6fb6211 (patch)
tree97cc08ecf69992245bfc1438075ceb635d564625
parent1a66960ca2835e5d78ce7c1527a58c939bb843d9 (diff)
parent36dec1886a480eff7b0db62fb567df23f453beb8 (diff)
Merge "Improve "Enabling rollback" log with rollbackId and originalSessionId" into main am: f99d2e86f9 am: 36dec1886a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3107597 Change-Id: If56d36ba53139695edf00ae5c238599dd2ba6eae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index c8bcc5128c3a..e753ce845ddc 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -926,7 +926,9 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba
}
Slog.i(TAG, "Enabling rollback for install of " + packageName
+ ", session:" + session.sessionId
- + ", rollbackDataPolicy=" + rollbackDataPolicy);
+ + ", rollbackDataPolicy=" + rollbackDataPolicy
+ + ", rollbackId:" + rollback.info.getRollbackId()
+ + ", originalSessionId:" + rollback.getOriginalSessionId());
final String installerPackageName = session.getInstallerPackageName();
if (!enableRollbackAllowed(installerPackageName, packageName)) {