Merge "Clear BCB if space allocation failed" am: b667621f8b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1997490

Change-Id: Id9e3f312578a322784d8e80025ee72ac1419bf57

1 files changed, 2 insertions, 0 deletions

diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java
index 944b71700450..a3b836adfc8b 100644
--- a/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@ -674,10 +674,12 @@ public class RecoverySystem {
             }
             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();
             }