From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Tue, 5 Apr 2022 11:39:26 +0000 (+0100)
Subject: storage-mode-concat
X-Git-Tag: archive/raspbian/11.0.0+r48-4+rpi1~1^2^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=750ef9c27b6113dee94e7ce15bb69f7f34c76f48;p=android-platform-art.git

storage-mode-concat


Gbp-Pq: Name storage-mode-concat.patch
---

diff --git a/runtime/image.cc b/runtime/image.cc
index b6bb0b1..a7ad374 100644
--- a/runtime/image.cc
+++ b/runtime/image.cc
@@ -172,7 +172,7 @@ bool ImageHeader::Block::Decompress(uint8_t* out_ptr,
     }
     default: {
       if (error_msg != nullptr) {
-        *error_msg = (std::ostringstream() << "Invalid image format " << storage_mode_).str();
+        *error_msg = "Invalid image format " + storage_mode_;
       }
       return false;
     }