From b25d62808e4cb31e494f72cfdcac03f279aa90f7 Mon Sep 17 00:00:00 2001
From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Thu, 28 Jul 2022 17:01:55 +0100
Subject: [PATCH] Fix concatenation of storage_mode string.

Forwarded: not-needed


Gbp-Pq: Topic art
Gbp-Pq: Name storage-mode-concat.patch
---
 art/runtime/image.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
     }
-- 
2.30.2