diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-23 01:14:52 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-23 01:14:52 +0000 |
commit | 0bdf33ba5640a23044ee89c1c1058002944e9bb2 (patch) | |
tree | 6a513ac5f950643b65d9b78cf65af96a75d3ac13 | |
parent | 5e8a00615f2343810945d64e27afee086e8b55bc (diff) | |
parent | 8244a8b367e137256cd429349972d5cbb57eaca6 (diff) | |
download | native-aml_per_331710050.tar.gz |
Snap for 9640974 from 8244a8b367e137256cd429349972d5cbb57eaca6 to mainline-permission-releaseaml_per_331710050
Change-Id: I183fc90ba2d9b6179f2323ec8986bc9d1089cc97
-rw-r--r-- | libs/binder/ndk/include_cpp/android/binder_auto_utils.h | 9 | ||||
-rw-r--r-- | libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libs/binder/ndk/include_cpp/android/binder_auto_utils.h b/libs/binder/ndk/include_cpp/android/binder_auto_utils.h index 7ea9be797b..885048a3d3 100644 --- a/libs/binder/ndk/include_cpp/android/binder_auto_utils.h +++ b/libs/binder/ndk/include_cpp/android/binder_auto_utils.h @@ -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. */ diff --git a/libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp b/libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp index f3cd21822d..43b2cb8577 100644 --- a/libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp +++ b/libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp @@ -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; } } |