From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Tue, 10 May 2022 10:33:56 +0000 (+0100)
Subject: Fix concatenation of storage_mode string.
X-Git-Tag: archive/raspbian/11.0.0+r48-4+rpi1~1^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2aff4534f6f2e29850fb8c3af0d2310d6a66aad0;p=android-platform-art.git

Fix concatenation of storage_mode string.

Forwarded: not-needed


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

diff --git a/runtime/image.cc b/runtime/image.cc
index 782c0c6..5e3339d 100644
--- a/runtime/image.cc
+++ b/runtime/image.cc
@@ -191,7 +191,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;
     }