Merge "Fix an NPE" into sc-dev

2021-03-30 10:53:07 +00:00
parent 46b8d72273 02913eb3d4
commit 352fa3bd45
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -615,7 +615,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba
                if (session == null || session.isStagedSessionFailed()) {
                    iter.remove();
                    deleteRollback(rollback,
-                            "Session " + session.getSessionId() + " not existed or failed");
+                            "Session " + rollback.getStagedSessionId() + " not existed or failed");
                    continue;
                }