commit b667621f8bcbc16c2f5706fdf018465f7ef3bb0c
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 24 18:58:21 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 24 18:58:21 2022 +0000
tree 8a6a901cdf213db799765cd699cc49da1985d852
parent 04eeb94b79af1b9b6dd9f850e07d981d7b1bf54e
parent c256798220cfa9ca863eaae86e8aee4052712e8a

Merge "Clear BCB if space allocation failed"

core/java/android/os/RecoverySystem.java

diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java
index 944b717..a3b836a 100644
--- a/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@ -674,10 +674,12 @@
             }
             try {
                 if (!rs.allocateSpaceForUpdate(packageFile)) {
+                    rs.clearBcb();
                     throw new IOException("Failed to allocate space for update "
                             + packageFile.getAbsolutePath());
                 }
             } catch (RemoteException e) {
+                rs.clearBcb();
                 e.rethrowAsRuntimeException();
             }