diff options
Diffstat (limited to 'tests/golden_output/aidl_test_loggable_interface-cpp-source')
6 files changed, 28 insertions, 12 deletions
diff --git a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp index 5910ede0..108bcba1 100644 --- a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp +++ b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/Data.cpp @@ -13,7 +13,7 @@ namespace loggable { } if (_aidl_parcelable_raw_size < 4) return ::android::BAD_VALUE; size_t _aidl_parcelable_size = static_cast<size_t>(_aidl_parcelable_raw_size); - if (_aidl_start_pos > SIZE_MAX - _aidl_parcelable_size) return ::android::BAD_VALUE; + if (_aidl_start_pos > INT32_MAX - _aidl_parcelable_size) return ::android::BAD_VALUE; if (_aidl_parcel->dataPosition() - _aidl_start_pos >= _aidl_parcelable_size) { _aidl_parcel->setDataPosition(_aidl_start_pos + _aidl_parcelable_size); return _aidl_ret_status; diff --git a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/ILoggableInterface.cpp b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/ILoggableInterface.cpp index 676d78a9..01113bf7 100644 --- a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/ILoggableInterface.cpp +++ b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/android/aidl/loggable/ILoggableInterface.cpp @@ -30,7 +30,7 @@ std::function<void(const BpLoggableInterface::TransactionLog&)> BpLoggableInterf ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; - ::android::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ILoggableInterface::LogThis::cppClient"); + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ILoggableInterface::LogThis::cppClient"); BpLoggableInterface::TransactionLog _transaction_log; if (BpLoggableInterface::logFunc != nullptr) { _transaction_log.input_args.emplace_back("boolValue", ::android::internal::ToString(boolValue)); @@ -285,7 +285,7 @@ BnLoggableInterface::BnLoggableInterface() _aidl_ret_status = ::android::BAD_TYPE; break; } - ::android::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ILoggableInterface::LogThis::cppServer"); + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ILoggableInterface::LogThis::cppServer"); _aidl_ret_status = _aidl_data.readBool(&in_boolValue); if (((_aidl_ret_status) != (::android::OK))) { break; @@ -530,7 +530,7 @@ std::function<void(const ILoggableInterface::BpSub::TransactionLog&)> ILoggableI ::android::Parcel _aidl_reply; ::android::status_t _aidl_ret_status = ::android::OK; ::android::binder::Status _aidl_status; - ::android::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ISub::Log::cppClient"); + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ISub::Log::cppClient"); ILoggableInterface::BpSub::TransactionLog _transaction_log; if (ILoggableInterface::BpSub::logFunc != nullptr) { _transaction_log.input_args.emplace_back("value", ::android::internal::ToString(value)); @@ -604,7 +604,7 @@ ILoggableInterface::BnSub::BnSub() _aidl_ret_status = ::android::BAD_TYPE; break; } - ::android::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ISub::Log::cppServer"); + ::android::binder::ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "AIDL::cpp::ISub::Log::cppServer"); _aidl_ret_status = _aidl_data.readInt32(&in_value); if (((_aidl_ret_status) != (::android::OK))) { break; diff --git a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/BnLoggableInterface.h b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/BnLoggableInterface.h index 475068e5..46df0810 100644 --- a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/BnLoggableInterface.h +++ b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/BnLoggableInterface.h @@ -4,6 +4,10 @@ #include <android/aidl/loggable/ILoggableInterface.h> #include <functional> #include <android/binder_to_string.h> +#include <android/aidl/loggable/BnLoggableInterface.h> +#include <android/aidl/loggable/ILoggableInterface.h> +#include <binder/Delegate.h> + namespace android { namespace aidl { @@ -32,8 +36,9 @@ public: class ILoggableInterfaceDelegator : public BnLoggableInterface { public: - explicit ILoggableInterfaceDelegator(::android::sp<ILoggableInterface> &impl) : _aidl_delegate(impl) {} + explicit ILoggableInterfaceDelegator(const ::android::sp<ILoggableInterface> &impl) : _aidl_delegate(impl) {} + ::android::sp<ILoggableInterface> getImpl() { return _aidl_delegate; } ::android::binder::Status LogThis(bool boolValue, ::std::vector<bool>* boolArray, int8_t byteValue, ::std::vector<uint8_t>* byteArray, char16_t charValue, ::std::vector<char16_t>* charArray, int32_t intValue, ::std::vector<int32_t>* intArray, int64_t longValue, ::std::vector<int64_t>* longArray, float floatValue, ::std::vector<float>* floatArray, double doubleValue, ::std::vector<double>* doubleArray, const ::android::String16& stringValue, ::std::vector<::android::String16>* stringArray, ::std::vector<::android::String16>* listValue, const ::android::aidl::loggable::Data& dataValue, const ::android::sp<::android::IBinder>& binderValue, ::std::optional<::android::os::ParcelFileDescriptor>* pfdValue, ::std::vector<::android::os::ParcelFileDescriptor>* pfdArray, ::std::vector<::android::String16>* _aidl_return) override { return _aidl_delegate->LogThis(boolValue, boolArray, byteValue, byteArray, charValue, charArray, intValue, intArray, longValue, longArray, floatValue, floatArray, doubleValue, doubleArray, stringValue, stringArray, listValue, dataValue, binderValue, pfdValue, pfdArray, _aidl_return); } diff --git a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/Data.h b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/Data.h index 61b590e3..61d71e0b 100644 --- a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/Data.h +++ b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/Data.h @@ -41,8 +41,8 @@ public: ::android::status_t readFromParcel(const ::android::Parcel* _aidl_parcel) final; ::android::status_t writeToParcel(::android::Parcel* _aidl_parcel) const final; static const ::android::String16& getParcelableDescriptor() { - static const ::android::StaticString16 DESCIPTOR (u"android.aidl.loggable.Data"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.loggable.Data"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/ILoggableInterface.h b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/ILoggableInterface.h index 2c2cfb93..98527e5a 100644 --- a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/ILoggableInterface.h +++ b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/ILoggableInterface.h @@ -2,26 +2,36 @@ #include <android/aidl/loggable/Data.h> #include <android/binder_to_string.h> +#include <binder/Delegate.h> #include <binder/IBinder.h> #include <binder/IInterface.h> #include <binder/ParcelFileDescriptor.h> #include <binder/Status.h> +#include <binder/Trace.h> #include <cstdint> #include <functional> #include <optional> #include <utils/String16.h> #include <utils/StrongPointer.h> -#include <utils/Trace.h> #include <vector> +namespace android::aidl::loggable { +class Data; +} // namespace android::aidl::loggable namespace android { namespace aidl { namespace loggable { +class ILoggableInterfaceDelegator; + class ILoggableInterface : public ::android::IInterface { public: + typedef ILoggableInterfaceDelegator DefaultDelegator; DECLARE_META_INTERFACE(LoggableInterface) + class ISubDelegator; + class ISub : public ::android::IInterface { public: + typedef ISubDelegator DefaultDelegator; DECLARE_META_INTERFACE(Sub) virtual ::android::binder::Status Log(int32_t value) = 0; }; // class ISub @@ -80,8 +90,9 @@ public: class ISubDelegator : public BnSub { public: - explicit ISubDelegator(::android::sp<ISub> &impl) : _aidl_delegate(impl) {} + explicit ISubDelegator(const ::android::sp<ISub> &impl) : _aidl_delegate(impl) {} + ::android::sp<ISub> getImpl() { return _aidl_delegate; } ::android::binder::Status Log(int32_t value) override { return _aidl_delegate->Log(value); } diff --git a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/Union.h b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/Union.h index 9b67e566..903dfb49 100644 --- a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/Union.h +++ b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/Union.h @@ -97,8 +97,8 @@ public: ::android::status_t readFromParcel(const ::android::Parcel* _aidl_parcel) final; ::android::status_t writeToParcel(::android::Parcel* _aidl_parcel) const final; static const ::android::String16& getParcelableDescriptor() { - static const ::android::StaticString16 DESCIPTOR (u"android.aidl.loggable.Union"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.loggable.Union"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; |