| commit | 4a3c2febcf72d93dd10d61ac91170c4bf6fb6211 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri May 31 14:47:02 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 31 14:47:02 2024 +0000 |
| tree | 97cc08ecf69992245bfc1438075ceb635d564625 | |
| parent | 1a66960ca2835e5d78ce7c1527a58c939bb843d9 [diff] | |
| parent | 36dec1886a480eff7b0db62fb567df23f453beb8 [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>
diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java index c8bcc51..e753ce8 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 @@ } 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)) {