Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f08e843 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: Status s/stringstream/ostream/" am: 5e36c715 am:... 

Merge "libbinder: Status s/stringstream/ostream/" am: 5e36c715 am: 84adff87 am: 85b507c3 am: 889c0715

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

Change-Id: I2fe370435cbcd27ac6df823029a3ad1c8ae879f0
parents 92183858 889c0715

libs/binder/Status.cpp

+0 −5
Original line number Diff line number Diff line
@@ -245,10 +245,5 @@ String8 Status::toString8() const { 
    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

+5 −3
Original line number Diff line number Diff line
@@ -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 @@ private: 
    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