commit 84adff87d5ccd2d09dfdc5d0f2b285d4efffe1e8
author Steven Moreland <smoreland@google.com> Mon Nov 16 16:27:28 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 16 16:27:28 2020 +0000
tree 8e7ad89c647e1736402689403274e84674010356
parent d51dc5e56163923be1bfdb1463f80ca6210ed2ec
parent 5e36c715550cd3bf1d8a72101372a7adfcc11c86

Merge "libbinder: Status s/stringstream/ostream/" am: 5e36c71555

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1498439

Change-Id: If028d7311b189e6d4437c54ab7f906a9b9794c90

libs/binder/Status.cpp

diff --git a/libs/binder/Status.cpp b/libs/binder/Status.cpp
index 64ab7a9..b5a078c 100644
--- a/libs/binder/Status.cpp
+++ b/libs/binder/Status.cpp
@@ -245,10 +245,5 @@
     return ret;
 }
 
-std::stringstream& operator<< (std::stringstream& stream, const Status& s) {
-    stream << s.toString8().string();
-    return stream;
-}
-
 }  // namespace binder
 }  // namespace android

libs/binder/include/binder/Status.h

diff --git a/libs/binder/include/binder/Status.h b/libs/binder/include/binder/Status.h
index 7d889b6..c30ae01 100644
--- a/libs/binder/include/binder/Status.h
+++ b/libs/binder/include/binder/Status.h
@@ -18,7 +18,8 @@
 #define ANDROID_BINDER_STATUS_H
 
 #include <cstdint>
-#include <sstream>
+#include <sstream> // historical
+#include <ostream>
 
 #include <binder/Parcel.h>
 #include <utils/String8.h>
@@ -153,8 +154,9 @@
     String8 mMessage;
 };  // class Status
 
-// For gtest output logging
-std::stringstream& operator<< (std::stringstream& stream, const Status& s);
+static inline std::ostream& operator<< (std::ostream& o, const Status& s) {
+    return o << s.toString8();
+}
 
 }  // namespace binder
 }  // namespace android