From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Mon, 27 Jun 2022 17:30:12 +0000 (+0100)
Subject: Fix concatenation of storage_mode string.
X-Git-Tag: archive/raspbian/29.0.6-19+rpi1^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c4c5d97129da2ac923e2c12e29f4b62b691c19af;p=android-platform-tools.git

Fix concatenation of storage_mode string.

Forwarded: not-needed


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

diff --git a/art/runtime/image.cc b/art/runtime/image.cc
index 782c0c6d..5e3339de 100644
--- a/art/runtime/image.cc
+++ b/art/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;
     }