From ff29fc321a792e0de03a00bf0e73b5f4f42f06a5 Mon Sep 17 00:00:00 2001 From: Zim Date: Fri, 2 Sep 2022 10:33:58 +0100 Subject: Enable aidl_interface tracing by default for Cpp backend See aosp/Ibc4b05f1c2015a1658c6babed5d7687c5c79600f for the change to trampoline tracing functions through libbinder instead of libcutils Test: Manual Bug: 161393989 Change-Id: I23fbc7734564ce6b25ff6369b0e430584e188ac7 --- .../aidl/fixedsizearray/FixedSizeArrayExample.cpp | 16 +++ .../aidl/fixedsizearray/FixedSizeArrayExample.h | 1 + .../gen/android/aidl/tests/ArrayOfInterfaces.cpp | 2 + .../gen/android/aidl/tests/INamedCallback.cpp | 2 + .../gen/android/aidl/tests/INewName.cpp | 2 + .../gen/android/aidl/tests/IOldName.cpp | 2 + .../gen/android/aidl/tests/ITestService.cpp | 134 +++++++++++++++++++++ .../gen/android/aidl/tests/ListOfInterfaces.cpp | 2 + .../android/aidl/tests/nested/INestedService.cpp | 6 + .../include/android/aidl/tests/ArrayOfInterfaces.h | 1 + .../gen/include/android/aidl/tests/IDeprecated.h | 1 + .../include/android/aidl/tests/INamedCallback.h | 1 + .../gen/include/android/aidl/tests/INewName.h | 1 + .../gen/include/android/aidl/tests/IOldName.h | 1 + .../gen/include/android/aidl/tests/ITestService.h | 1 + .../include/android/aidl/tests/ListOfInterfaces.h | 1 + .../android/aidl/tests/nested/INestedService.h | 1 + .../android/aidl/versioned/tests/IFooInterface.cpp | 8 ++ .../android/aidl/versioned/tests/IFooInterface.h | 1 + 19 files changed, 184 insertions(+) (limited to 'tests') diff --git a/tests/golden_output/aidl-test-fixedsizearray-cpp-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.cpp b/tests/golden_output/aidl-test-fixedsizearray-cpp-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.cpp index f4023941..db3d59b9 100644 --- a/tests/golden_output/aidl-test-fixedsizearray-cpp-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.cpp +++ b/tests/golden_output/aidl-test-fixedsizearray-cpp-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.cpp @@ -718,6 +718,7 @@ FixedSizeArrayExample::BpRepeatFixedSizeArray::BpRepeatFixedSizeArray(const ::an ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::RepeatBytes::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -759,6 +760,7 @@ FixedSizeArrayExample::BpRepeatFixedSizeArray::BpRepeatFixedSizeArray(const ::an ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::RepeatInts::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -800,6 +802,7 @@ FixedSizeArrayExample::BpRepeatFixedSizeArray::BpRepeatFixedSizeArray(const ::an ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::RepeatBinders::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -841,6 +844,7 @@ FixedSizeArrayExample::BpRepeatFixedSizeArray::BpRepeatFixedSizeArray(const ::an ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::RepeatParcelables::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -882,6 +886,7 @@ FixedSizeArrayExample::BpRepeatFixedSizeArray::BpRepeatFixedSizeArray(const ::an ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::Repeat2dBytes::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -923,6 +928,7 @@ FixedSizeArrayExample::BpRepeatFixedSizeArray::BpRepeatFixedSizeArray(const ::an ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::Repeat2dInts::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -964,6 +970,7 @@ FixedSizeArrayExample::BpRepeatFixedSizeArray::BpRepeatFixedSizeArray(const ::an ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::Repeat2dBinders::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1005,6 +1012,7 @@ FixedSizeArrayExample::BpRepeatFixedSizeArray::BpRepeatFixedSizeArray(const ::an ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::Repeat2dParcelables::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1068,6 +1076,7 @@ FixedSizeArrayExample::BnRepeatFixedSizeArray::BnRepeatFixedSizeArray() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::RepeatBytes::cppServer"); _aidl_ret_status = _aidl_data.readFixedArray(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -1103,6 +1112,7 @@ FixedSizeArrayExample::BnRepeatFixedSizeArray::BnRepeatFixedSizeArray() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::RepeatInts::cppServer"); _aidl_ret_status = _aidl_data.readFixedArray(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -1138,6 +1148,7 @@ FixedSizeArrayExample::BnRepeatFixedSizeArray::BnRepeatFixedSizeArray() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::RepeatBinders::cppServer"); _aidl_ret_status = _aidl_data.readFixedArray(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -1173,6 +1184,7 @@ FixedSizeArrayExample::BnRepeatFixedSizeArray::BnRepeatFixedSizeArray() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::RepeatParcelables::cppServer"); _aidl_ret_status = _aidl_data.readFixedArray(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -1208,6 +1220,7 @@ FixedSizeArrayExample::BnRepeatFixedSizeArray::BnRepeatFixedSizeArray() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::Repeat2dBytes::cppServer"); _aidl_ret_status = _aidl_data.readFixedArray(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -1243,6 +1256,7 @@ FixedSizeArrayExample::BnRepeatFixedSizeArray::BnRepeatFixedSizeArray() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::Repeat2dInts::cppServer"); _aidl_ret_status = _aidl_data.readFixedArray(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -1278,6 +1292,7 @@ FixedSizeArrayExample::BnRepeatFixedSizeArray::BnRepeatFixedSizeArray() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::Repeat2dBinders::cppServer"); _aidl_ret_status = _aidl_data.readFixedArray(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -1313,6 +1328,7 @@ FixedSizeArrayExample::BnRepeatFixedSizeArray::BnRepeatFixedSizeArray() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IRepeatFixedSizeArray::Repeat2dParcelables::cppServer"); _aidl_ret_status = _aidl_data.readFixedArray(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; diff --git a/tests/golden_output/aidl-test-fixedsizearray-cpp-source/gen/include/android/aidl/fixedsizearray/FixedSizeArrayExample.h b/tests/golden_output/aidl-test-fixedsizearray-cpp-source/gen/include/android/aidl/fixedsizearray/FixedSizeArrayExample.h index d35b8a22..ae43f064 100644 --- a/tests/golden_output/aidl-test-fixedsizearray-cpp-source/gen/include/android/aidl/fixedsizearray/FixedSizeArrayExample.h +++ b/tests/golden_output/aidl-test-fixedsizearray-cpp-source/gen/include/android/aidl/fixedsizearray/FixedSizeArrayExample.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ArrayOfInterfaces.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ArrayOfInterfaces.cpp index 75bc6b2e..357e7d8e 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ArrayOfInterfaces.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ArrayOfInterfaces.cpp @@ -114,6 +114,7 @@ ArrayOfInterfaces::BpMyInterface::BpMyInterface(const ::android::sp<::android::I ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IMyInterface::methodWithInterfaces::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -223,6 +224,7 @@ ArrayOfInterfaces::BnMyInterface::BnMyInterface() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IMyInterface::methodWithInterfaces::cppServer"); _aidl_ret_status = _aidl_data.readStrongBinder(&in_iface); if (((_aidl_ret_status) != (::android::OK))) { break; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/INamedCallback.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/INamedCallback.cpp index 1bc05ddf..c212d54e 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/INamedCallback.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/INamedCallback.cpp @@ -26,6 +26,7 @@ BpNamedCallback::BpNamedCallback(const ::android::sp<::android::IBinder>& _aidl_ ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::INamedCallback::GetName::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -79,6 +80,7 @@ BnNamedCallback::BnNamedCallback() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::INamedCallback::GetName::cppServer"); ::android::binder::Status _aidl_status(GetName(&_aidl_return)); _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply); if (((_aidl_ret_status) != (::android::OK))) { diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/INewName.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/INewName.cpp index b308856c..955d36fb 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/INewName.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/INewName.cpp @@ -26,6 +26,7 @@ BpNewName::BpNewName(const ::android::sp<::android::IBinder>& _aidl_impl) ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::INewName::RealName::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -79,6 +80,7 @@ BnNewName::BnNewName() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::INewName::RealName::cppServer"); ::android::binder::Status _aidl_status(RealName(&_aidl_return)); _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply); if (((_aidl_ret_status) != (::android::OK))) { diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/IOldName.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/IOldName.cpp index ee04a4e3..0e99b42f 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/IOldName.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/IOldName.cpp @@ -26,6 +26,7 @@ BpOldName::BpOldName(const ::android::sp<::android::IBinder>& _aidl_impl) ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IOldName::RealName::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -79,6 +80,7 @@ BnOldName::BnOldName() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IOldName::RealName::cppServer"); ::android::binder::Status _aidl_status(RealName(&_aidl_return)); _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply); if (((_aidl_ret_status) != (::android::OK))) { diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ITestService.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ITestService.cpp index 5b617526..7e7aa09b 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ITestService.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ITestService.cpp @@ -39,6 +39,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::UnimplementedMethod::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -77,6 +78,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::Deprecated::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -107,6 +109,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::TestOneway::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -130,6 +133,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatBoolean::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -168,6 +172,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatByte::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -206,6 +211,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatChar::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -244,6 +250,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatInt::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -282,6 +289,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatLong::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -320,6 +328,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatFloat::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -358,6 +367,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatDouble::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -396,6 +406,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatString::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -434,6 +445,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatByteEnum::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -472,6 +484,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatIntEnum::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -510,6 +523,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatLongEnum::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -548,6 +562,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseBoolean::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -594,6 +609,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseByte::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -640,6 +656,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseChar::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -686,6 +703,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseInt::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -732,6 +750,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseLong::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -778,6 +797,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseFloat::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -824,6 +844,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseDouble::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -870,6 +891,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseString::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -916,6 +938,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseByteEnum::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -962,6 +985,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseIntEnum::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1008,6 +1032,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseLongEnum::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1054,6 +1079,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetOtherTestService::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1092,6 +1118,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::SetOtherTestService::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1134,6 +1161,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::VerifyName::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1176,6 +1204,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetInterfaceArray::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1214,6 +1243,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::VerifyNamesWithInterfaceArray::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1256,6 +1286,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetNullableInterfaceArray::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1294,6 +1325,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::VerifyNamesWithNullableInterfaceArray::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1336,6 +1368,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetInterfaceList::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1374,6 +1407,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::VerifyNamesWithInterfaceList::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1416,6 +1450,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseStringList::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1458,6 +1493,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatParcelFileDescriptor::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1496,6 +1532,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseParcelFileDescriptorArray::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1542,6 +1579,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ThrowServiceException::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1576,6 +1614,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableIntArray::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1614,6 +1653,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableByteEnumArray::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1652,6 +1692,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableIntEnumArray::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1690,6 +1731,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableLongEnumArray::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1728,6 +1770,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableString::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1766,6 +1809,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableStringList::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1804,6 +1848,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableParcelable::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1842,6 +1887,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableParcelableArray::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1880,6 +1926,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableParcelableList::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1918,6 +1965,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::TakesAnIBinder::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1952,6 +2000,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::TakesANullableIBinder::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -1986,6 +2035,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::TakesAnIBinderList::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2020,6 +2070,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::TakesANullableIBinderList::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2054,6 +2105,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatUtf8CppString::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2092,6 +2144,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableUtf8CppString::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2130,6 +2183,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseUtf8CppString::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2176,6 +2230,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseNullableUtf8CppString::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2222,6 +2277,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseUtf8CppStringList::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2264,6 +2320,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetCallback::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2302,6 +2359,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::FillOutStructuredParcelable::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2340,6 +2398,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatExtendableParcelable::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2378,6 +2437,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseList::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2416,6 +2476,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseIBinderArray::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2462,6 +2523,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseNullableIBinderArray::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2508,6 +2570,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetOldNameInterface::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2542,6 +2605,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetNewNameInterface::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2576,6 +2640,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetUnionTags::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2614,6 +2679,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetCppJavaTests::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2648,6 +2714,7 @@ BpTestService::BpTestService(const ::android::sp<::android::IBinder>& _aidl_impl ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::getBackendType::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -2705,6 +2772,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::UnimplementedMethod::cppServer"); _aidl_ret_status = _aidl_data.readInt32(&in_arg); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -2733,6 +2801,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::Deprecated::cppServer"); ::android::binder::Status _aidl_status(Deprecated()); _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply); if (((_aidl_ret_status) != (::android::OK))) { @@ -2749,6 +2818,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::TestOneway::cppServer"); ::android::binder::Status _aidl_status(TestOneway()); } break; @@ -2760,6 +2830,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatBoolean::cppServer"); _aidl_ret_status = _aidl_data.readBool(&in_token); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -2790,6 +2861,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatByte::cppServer"); _aidl_ret_status = _aidl_data.readByte(&in_token); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -2820,6 +2892,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatChar::cppServer"); _aidl_ret_status = _aidl_data.readChar(&in_token); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -2850,6 +2923,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatInt::cppServer"); _aidl_ret_status = _aidl_data.readInt32(&in_token); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -2880,6 +2954,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatLong::cppServer"); _aidl_ret_status = _aidl_data.readInt64(&in_token); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -2910,6 +2985,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatFloat::cppServer"); _aidl_ret_status = _aidl_data.readFloat(&in_token); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -2940,6 +3016,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatDouble::cppServer"); _aidl_ret_status = _aidl_data.readDouble(&in_token); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -2970,6 +3047,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatString::cppServer"); _aidl_ret_status = _aidl_data.readString16(&in_token); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3000,6 +3078,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatByteEnum::cppServer"); _aidl_ret_status = _aidl_data.readByte(reinterpret_cast(&in_token)); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3030,6 +3109,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatIntEnum::cppServer"); _aidl_ret_status = _aidl_data.readInt32(reinterpret_cast(&in_token)); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3060,6 +3140,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatLongEnum::cppServer"); _aidl_ret_status = _aidl_data.readInt64(reinterpret_cast(&in_token)); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3091,6 +3172,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseBoolean::cppServer"); _aidl_ret_status = _aidl_data.readBoolVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3130,6 +3212,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseByte::cppServer"); _aidl_ret_status = _aidl_data.readByteVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3169,6 +3252,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseChar::cppServer"); _aidl_ret_status = _aidl_data.readCharVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3208,6 +3292,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseInt::cppServer"); _aidl_ret_status = _aidl_data.readInt32Vector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3247,6 +3332,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseLong::cppServer"); _aidl_ret_status = _aidl_data.readInt64Vector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3286,6 +3372,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseFloat::cppServer"); _aidl_ret_status = _aidl_data.readFloatVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3325,6 +3412,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseDouble::cppServer"); _aidl_ret_status = _aidl_data.readDoubleVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3364,6 +3452,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseString::cppServer"); _aidl_ret_status = _aidl_data.readString16Vector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3403,6 +3492,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseByteEnum::cppServer"); _aidl_ret_status = _aidl_data.readEnumVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3442,6 +3532,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseIntEnum::cppServer"); _aidl_ret_status = _aidl_data.readEnumVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3481,6 +3572,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseLongEnum::cppServer"); _aidl_ret_status = _aidl_data.readEnumVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3519,6 +3611,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetOtherTestService::cppServer"); _aidl_ret_status = _aidl_data.readString16(&in_name); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3550,6 +3643,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::SetOtherTestService::cppServer"); _aidl_ret_status = _aidl_data.readString16(&in_name); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3585,6 +3679,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::VerifyName::cppServer"); _aidl_ret_status = _aidl_data.readStrongBinder(&in_service); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3619,6 +3714,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetInterfaceArray::cppServer"); _aidl_ret_status = _aidl_data.readString16Vector(&in_names); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3650,6 +3746,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::VerifyNamesWithInterfaceArray::cppServer"); _aidl_ret_status = _aidl_data.readStrongBinderVector(&in_services); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3684,6 +3781,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetNullableInterfaceArray::cppServer"); _aidl_ret_status = _aidl_data.readString16Vector(&in_names); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3715,6 +3813,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::VerifyNamesWithNullableInterfaceArray::cppServer"); _aidl_ret_status = _aidl_data.readStrongBinderVector(&in_services); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3749,6 +3848,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetInterfaceList::cppServer"); _aidl_ret_status = _aidl_data.readString16Vector(&in_names); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3780,6 +3880,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::VerifyNamesWithInterfaceList::cppServer"); _aidl_ret_status = _aidl_data.readStrongBinderVector(&in_services); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3815,6 +3916,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseStringList::cppServer"); _aidl_ret_status = _aidl_data.readString16Vector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3849,6 +3951,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatParcelFileDescriptor::cppServer"); _aidl_ret_status = _aidl_data.readParcelable(&in_read); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3880,6 +3983,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseParcelFileDescriptorArray::cppServer"); _aidl_ret_status = _aidl_data.readParcelableVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3917,6 +4021,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ThrowServiceException::cppServer"); _aidl_ret_status = _aidl_data.readInt32(&in_code); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3943,6 +4048,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableIntArray::cppServer"); _aidl_ret_status = _aidl_data.readInt32Vector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -3973,6 +4079,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableByteEnumArray::cppServer"); _aidl_ret_status = _aidl_data.readEnumVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4003,6 +4110,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableIntEnumArray::cppServer"); _aidl_ret_status = _aidl_data.readEnumVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4033,6 +4141,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableLongEnumArray::cppServer"); _aidl_ret_status = _aidl_data.readEnumVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4063,6 +4172,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableString::cppServer"); _aidl_ret_status = _aidl_data.readString16(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4093,6 +4203,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableStringList::cppServer"); _aidl_ret_status = _aidl_data.readString16Vector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4123,6 +4234,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableParcelable::cppServer"); _aidl_ret_status = _aidl_data.readParcelable(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4153,6 +4265,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableParcelableArray::cppServer"); _aidl_ret_status = _aidl_data.readParcelableVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4183,6 +4296,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableParcelableList::cppServer"); _aidl_ret_status = _aidl_data.readParcelableVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4212,6 +4326,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::TakesAnIBinder::cppServer"); _aidl_ret_status = _aidl_data.readStrongBinder(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4237,6 +4352,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::TakesANullableIBinder::cppServer"); _aidl_ret_status = _aidl_data.readNullableStrongBinder(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4262,6 +4378,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::TakesAnIBinderList::cppServer"); _aidl_ret_status = _aidl_data.readStrongBinderVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4287,6 +4404,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::TakesANullableIBinderList::cppServer"); _aidl_ret_status = _aidl_data.readStrongBinderVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4313,6 +4431,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatUtf8CppString::cppServer"); _aidl_ret_status = _aidl_data.readUtf8FromUtf16(&in_token); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4343,6 +4462,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatNullableUtf8CppString::cppServer"); _aidl_ret_status = _aidl_data.readUtf8FromUtf16(&in_token); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4374,6 +4494,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseUtf8CppString::cppServer"); _aidl_ret_status = _aidl_data.readUtf8VectorFromUtf16Vector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4413,6 +4534,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseNullableUtf8CppString::cppServer"); _aidl_ret_status = _aidl_data.readUtf8VectorFromUtf16Vector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4452,6 +4574,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseUtf8CppStringList::cppServer"); _aidl_ret_status = _aidl_data.readUtf8VectorFromUtf16Vector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4486,6 +4609,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetCallback::cppServer"); _aidl_ret_status = _aidl_data.readBool(&in_return_null); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4515,6 +4639,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::FillOutStructuredParcelable::cppServer"); _aidl_ret_status = _aidl_data.readParcelable(&in_parcel); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4545,6 +4670,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::RepeatExtendableParcelable::cppServer"); _aidl_ret_status = _aidl_data.readParcelable(&in_ep); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4575,6 +4701,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseList::cppServer"); _aidl_ret_status = _aidl_data.readParcelable(&in_list); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4606,6 +4733,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseIBinderArray::cppServer"); _aidl_ret_status = _aidl_data.readStrongBinderVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4645,6 +4773,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::ReverseNullableIBinderArray::cppServer"); _aidl_ret_status = _aidl_data.readStrongBinderVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4682,6 +4811,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetOldNameInterface::cppServer"); ::android::binder::Status _aidl_status(GetOldNameInterface(&_aidl_return)); _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply); if (((_aidl_ret_status) != (::android::OK))) { @@ -4703,6 +4833,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetNewNameInterface::cppServer"); ::android::binder::Status _aidl_status(GetNewNameInterface(&_aidl_return)); _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply); if (((_aidl_ret_status) != (::android::OK))) { @@ -4725,6 +4856,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetUnionTags::cppServer"); _aidl_ret_status = _aidl_data.readParcelableVector(&in_input); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -4754,6 +4886,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::GetCppJavaTests::cppServer"); ::android::binder::Status _aidl_status(GetCppJavaTests(&_aidl_return)); _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply); if (((_aidl_ret_status) != (::android::OK))) { @@ -4775,6 +4908,7 @@ BnTestService::BnTestService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ITestService::getBackendType::cppServer"); ::android::binder::Status _aidl_status(getBackendType(&_aidl_return)); _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply); if (((_aidl_ret_status) != (::android::OK))) { diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ListOfInterfaces.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ListOfInterfaces.cpp index f0c2f4d6..949f0f7a 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ListOfInterfaces.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/ListOfInterfaces.cpp @@ -114,6 +114,7 @@ ListOfInterfaces::BpMyInterface::BpMyInterface(const ::android::sp<::android::IB ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IMyInterface::methodWithInterfaces::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -215,6 +216,7 @@ ListOfInterfaces::BnMyInterface::BnMyInterface() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IMyInterface::methodWithInterfaces::cppServer"); _aidl_ret_status = _aidl_data.readStrongBinder(&in_iface); if (((_aidl_ret_status) != (::android::OK))) { break; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/INestedService.cpp b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/INestedService.cpp index 01bffc9c..7b35c590 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/INestedService.cpp +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/android/aidl/tests/nested/INestedService.cpp @@ -29,6 +29,7 @@ BpNestedService::BpNestedService(const ::android::sp<::android::IBinder>& _aidl_ ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::INestedService::flipStatus::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -66,6 +67,7 @@ BpNestedService::BpNestedService(const ::android::sp<::android::IBinder>& _aidl_ ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::INestedService::flipStatusWithCallback::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -126,6 +128,7 @@ BnNestedService::BnNestedService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::INestedService::flipStatus::cppServer"); _aidl_ret_status = _aidl_data.readParcelable(&in_p); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -156,6 +159,7 @@ BnNestedService::BnNestedService() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::INestedService::flipStatusWithCallback::cppServer"); _aidl_ret_status = _aidl_data.readByte(reinterpret_cast(&in_status)); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -271,6 +275,7 @@ INestedService::BpCallback::BpCallback(const ::android::sp<::android::IBinder>& ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ICallback::done::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -326,6 +331,7 @@ INestedService::BnCallback::BnCallback() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ICallback::done::cppServer"); _aidl_ret_status = _aidl_data.readByte(reinterpret_cast(&in_status)); if (((_aidl_ret_status) != (::android::OK))) { break; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ArrayOfInterfaces.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ArrayOfInterfaces.h index 49bd7803..6c308c32 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ArrayOfInterfaces.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ArrayOfInterfaces.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/IDeprecated.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/IDeprecated.h index e926d472..7d829d30 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/IDeprecated.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/IDeprecated.h @@ -3,6 +3,7 @@ #include #include #include +#include #include namespace android { diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/INamedCallback.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/INamedCallback.h index 11f36876..2ceca2d0 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/INamedCallback.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/INamedCallback.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/INewName.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/INewName.h index b74b253c..b2615cc8 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/INewName.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/INewName.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/IOldName.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/IOldName.h index f25ddeae..86494fa6 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/IOldName.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/IOldName.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ITestService.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ITestService.h index 80183d69..2555b286 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ITestService.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ITestService.h @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ListOfInterfaces.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ListOfInterfaces.h index e56d7607..6ef69245 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ListOfInterfaces.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ListOfInterfaces.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/nested/INestedService.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/nested/INestedService.h index 1660162e..b6351733 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/nested/INestedService.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/nested/INestedService.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/android/aidl/versioned/tests/IFooInterface.cpp b/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/android/aidl/versioned/tests/IFooInterface.cpp index a3aea73b..b53f6b58 100644 --- a/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/android/aidl/versioned/tests/IFooInterface.cpp +++ b/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/android/aidl/versioned/tests/IFooInterface.cpp @@ -29,6 +29,7 @@ BpFooInterface::BpFooInterface(const ::android::sp<::android::IBinder>& _aidl_im ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IFooInterface::originalApi::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -58,6 +59,7 @@ BpFooInterface::BpFooInterface(const ::android::sp<::android::IBinder>& _aidl_im ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IFooInterface::acceptUnionAndReturnString::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -95,6 +97,7 @@ BpFooInterface::BpFooInterface(const ::android::sp<::android::IBinder>& _aidl_im ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IFooInterface::ignoreParcelablesAndRepeatInt::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -148,6 +151,7 @@ BpFooInterface::BpFooInterface(const ::android::sp<::android::IBinder>& _aidl_im ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IFooInterface::returnsLengthOfFooArray::cppClient"); _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor()); if (((_aidl_ret_status) != (::android::OK))) { goto _aidl_error; @@ -242,6 +246,7 @@ BnFooInterface::BnFooInterface() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IFooInterface::originalApi::cppServer"); ::android::binder::Status _aidl_status(originalApi()); _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply); if (((_aidl_ret_status) != (::android::OK))) { @@ -260,6 +265,7 @@ BnFooInterface::BnFooInterface() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IFooInterface::acceptUnionAndReturnString::cppServer"); _aidl_ret_status = _aidl_data.readParcelable(&in_u); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -293,6 +299,7 @@ BnFooInterface::BnFooInterface() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IFooInterface::ignoreParcelablesAndRepeatInt::cppServer"); _aidl_ret_status = _aidl_data.readParcelable(&in_inFoo); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -339,6 +346,7 @@ BnFooInterface::BnFooInterface() _aidl_ret_status = ::android::BAD_TYPE; break; } + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::IFooInterface::returnsLengthOfFooArray::cppServer"); _aidl_ret_status = _aidl_data.readParcelableVector(&in_foos); if (((_aidl_ret_status) != (::android::OK))) { break; diff --git a/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/include/android/aidl/versioned/tests/IFooInterface.h b/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/include/android/aidl/versioned/tests/IFooInterface.h index c9c1799a..811d74a9 100644 --- a/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/include/android/aidl/versioned/tests/IFooInterface.h +++ b/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/include/android/aidl/versioned/tests/IFooInterface.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include -- cgit v1.2.3