commit 3a7431766b3b40ca09eb1aba42ff9c1273a49196
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 11 23:24:32 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 11 23:24:32 2020 +0000
tree c1ea8d1766ba63ac085dac0d740095e126981bda
parent a804aea5df50aefd232a1c232f920ddbde1c7e3f
parent 3c824c4677c1117187cb18ec81d0659e19e31d5d

Merge "String16: operator<<" am: 824418c370 am: fddc5b2fb1

Change-Id: I368465a5a8865ea056a865bc08b77fc03c17175b

libutils/include/utils/String16.h

diff --git a/libutils/include/utils/String16.h b/libutils/include/utils/String16.h
index 27eca0c..c0e3f1e 100644
--- a/libutils/include/utils/String16.h
+++ b/libutils/include/utils/String16.h
@@ -17,7 +17,8 @@
 #ifndef ANDROID_STRING16_H
 #define ANDROID_STRING16_H
 
-#include <string> // for std::string
+#include <iostream>
+#include <string>
 
 #include <utils/Errors.h>
 #include <utils/String8.h>
@@ -195,6 +196,11 @@
 // require any change to the underlying SharedBuffer contents or reference count.
 ANDROID_TRIVIAL_MOVE_TRAIT(String16)
 
+static inline std::ostream& operator<<(std::ostream& os, const String16& str) {
+    os << String8(str).c_str();
+    return os;
+}
+
 // ---------------------------------------------------------------------------
 
 /*