From 02913eb3d42d79c07bac04be79c543f3ffceb11b Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Tue, 30 Mar 2021 11:25:22 +0800
Subject: [PATCH] Fix an NPE

A regression of ag/13066961.

'session' might be null inside the if block.
Use rollback.getStagedSessionId() to get the session ID instead.

Bug: 181087240
Test: manual test
Change-Id: Ie8bc2b451e5a1e5fd6fececccda7a3622c33a235
---
 .../com/android/server/rollback/RollbackManagerServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index a4459d04daa22..4adcfb62ef509 100644
--- 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;
                 }