From 237dd8123b9b7335a4444b551dbeeea624de0d33 Mon Sep 17 00:00:00 2001
From: Gavin Corkery <gavincorkery@google.com>
Date: Tue, 4 Jun 2019 22:53:15 +0100
Subject: [PATCH] Perform userdata backup for all matching rollbacks

Currently, the snapshot of userdata is performed by traversing
the list of rollbacks and matching based on the package name, returning
once a match is found and the userdata has been backed up. There may
be cases where multiple rollbacks match this package name, so we should
not return until we have checked all rollbacks.

Bug: 134485920
Test: atest RollbackTest
Test: atest StagedRollbackTest
Change-Id: If6051ba11b2163e282e7bb61ff02e669ba1079ab
---
 .../android/server/rollback/RollbackManagerServiceImpl.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index 301f650610455..e107c9aedf38b 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -1079,7 +1079,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
                     if (info.getPackageName().equals(packageName)) {
                         mAppDataRollbackHelper.snapshotAppData(data.info.getRollbackId(), info);
                         saveRollbackData(data);
-                        return;
+                        break;
                     }
                 }
             }
@@ -1091,7 +1091,6 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
                     mAppDataRollbackHelper.snapshotAppData(rollback.data.info.getRollbackId(),
                             info);
                     saveRollbackData(rollback.data);
-                    return;
                 }
             }
         }