Merge "libbinder_ndk: ScopedAStatus ostream<<" (7e95846b) · Commits · e / devices / smdk4412 / android_frameworks_native

libs/binder/ndk/include_cpp/android/binder_auto_utils.h

+7 −2

Original line number	Diff line number	Diff line
		@@ -30,11 +30,11 @@
		#include <android/binder_internal_logging.h>
		#include <android/binder_parcel.h>
		#include <android/binder_status.h>

		#include <assert.h>

		#include <unistd.h>

		#include <cstddef>
		#include <iostream>
		#include <string>

		namespace ndk {
		@@ -315,6 +315,11 @@ class ScopedAStatus : public impl::ScopedAResource<AStatus*, AStatus_delete, nul
		}
		};

		static inline std::ostream& operator<<(std::ostream& os, const ScopedAStatus& status) {
		return os << status.getDescription();
		return os;
		}

		/**
		* Convenience wrapper. See AIBinder_DeathRecipient.
		*/

+1 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ TEST(DoubleBinder, CallIntoNdk) {
		std::string outString;
		ScopedAStatus status = server->RepeatString("foo", &outString);
		EXPECT_EQ(STATUS_OK, AStatus_getExceptionCode(status.get()))
		<< serviceName << " " << status.getDescription();
		<< serviceName << " " << status;
		EXPECT_EQ("foo", outString) << serviceName;
		}
		}