From fdeddddc0b71f1344f06b427d649ff089100ae9c Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Wed, 23 Nov 2022 15:35:10 +0900 Subject: Fix typo in generated CPP code This shouldn't break anything because it's renaming a local/static variable. Bug: n/a Test: aidl_unittests Test: aidl_integration_test Change-Id: Ic419c50579e2b30764dc054d66b7e05605bd2219 --- .../aidl/fixedsizearray/FixedSizeArrayExample.h | 8 ++++---- .../include/android/aidl/tests/ArrayOfInterfaces.h | 12 ++++++------ .../include/android/aidl/tests/CircularParcelable.h | 4 ++-- .../android/aidl/tests/DeprecatedParcelable.h | 4 ++-- .../gen/include/android/aidl/tests/FixedSize.h | 12 ++++++------ .../android/aidl/tests/GenericStructuredParcelable.h | 4 ++-- .../gen/include/android/aidl/tests/ITestService.h | 16 ++++++++-------- .../include/android/aidl/tests/ListOfInterfaces.h | 12 ++++++------ .../android/aidl/tests/OtherParcelableForToString.h | 4 ++-- .../android/aidl/tests/ParcelableForToString.h | 4 ++-- .../gen/include/android/aidl/tests/RecursiveList.h | 4 ++-- .../android/aidl/tests/StructuredParcelable.h | 8 ++++---- .../gen/include/android/aidl/tests/Union.h | 4 ++-- .../gen/include/android/aidl/tests/UnionWithFd.h | 4 ++-- .../aidl/tests/extension/ExtendableParcelable.h | 4 ++-- .../gen/include/android/aidl/tests/extension/MyExt.h | 4 ++-- .../include/android/aidl/tests/extension/MyExt2.h | 4 ++-- .../include/android/aidl/tests/extension/MyExtLike.h | 4 ++-- .../include/android/aidl/tests/nested/DeeplyNested.h | 20 ++++++++++---------- .../android/aidl/tests/nested/INestedService.h | 4 ++-- .../android/aidl/tests/nested/ParcelableWithNested.h | 4 ++-- .../include/android/aidl/tests/unions/EnumUnion.h | 4 ++-- .../include/android/aidl/tests/unions/UnionInUnion.h | 4 ++-- .../include/android/aidl/versioned/tests/BazUnion.h | 4 ++-- .../gen/include/android/aidl/versioned/tests/Foo.h | 4 ++-- .../gen/include/android/aidl/loggable/Data.h | 4 ++-- .../gen/include/android/aidl/loggable/Union.h | 4 ++-- 27 files changed, 84 insertions(+), 84 deletions(-) (limited to 'tests') 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 ae43f064..75aefccd 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 @@ -48,8 +48,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.fixedsizearray.FixedSizeArrayExample.IntParcelable"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.fixedsizearray.FixedSizeArrayExample.IntParcelable"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -283,8 +283,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.fixedsizearray.FixedSizeArrayExample"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.fixedsizearray.FixedSizeArrayExample"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; 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 6c308c32..342469e8 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 @@ -142,8 +142,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.tests.ArrayOfInterfaces.MyParcelable"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.ArrayOfInterfaces.MyParcelable"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -237,8 +237,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.tests.ArrayOfInterfaces.MyUnion"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.ArrayOfInterfaces.MyUnion"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -277,8 +277,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.tests.ArrayOfInterfaces"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.ArrayOfInterfaces"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/CircularParcelable.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/CircularParcelable.h index bde2d9b9..c2d8a027 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/CircularParcelable.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/CircularParcelable.h @@ -39,8 +39,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.tests.CircularParcelable"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.CircularParcelable"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/DeprecatedParcelable.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/DeprecatedParcelable.h index aab50891..5d6079b6 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/DeprecatedParcelable.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/DeprecatedParcelable.h @@ -33,8 +33,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.tests.DeprecatedParcelable"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.DeprecatedParcelable"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/FixedSize.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/FixedSize.h index 65f67117..49304944 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/FixedSize.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/FixedSize.h @@ -111,8 +111,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.tests.FixedSize.FixedUnion"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.FixedSize.FixedUnion"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -178,8 +178,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.tests.FixedSize.FixedParcelable"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.FixedSize.FixedParcelable"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -219,8 +219,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.tests.FixedSize"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.FixedSize"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h index ef88a1cf..cacf198e 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/GenericStructuredParcelable.h @@ -37,8 +37,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.tests.GenericStructuredParcelable"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.GenericStructuredParcelable"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; 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 4d00ef85..ed0afc32 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 @@ -85,8 +85,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.tests.ITestService.Empty"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.ITestService.Empty"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -157,8 +157,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.tests.ITestService.CompilerChecks.HasDeprecated"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.ITestService.CompilerChecks.HasDeprecated"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -246,8 +246,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.tests.ITestService.CompilerChecks.UsingHasDeprecated"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.ITestService.CompilerChecks.UsingHasDeprecated"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -302,8 +302,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.tests.ITestService.CompilerChecks"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.ITestService.CompilerChecks"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; 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 6ef69245..e391f579 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 @@ -142,8 +142,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.tests.ListOfInterfaces.MyParcelable"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.ListOfInterfaces.MyParcelable"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -237,8 +237,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.tests.ListOfInterfaces.MyUnion"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.ListOfInterfaces.MyUnion"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -277,8 +277,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.tests.ListOfInterfaces"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.ListOfInterfaces"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/OtherParcelableForToString.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/OtherParcelableForToString.h index fa05b156..6f32726c 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/OtherParcelableForToString.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/OtherParcelableForToString.h @@ -34,8 +34,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.tests.OtherParcelableForToString"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.OtherParcelableForToString"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ParcelableForToString.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ParcelableForToString.h index 95084dbd..e57c7f73 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ParcelableForToString.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ParcelableForToString.h @@ -69,8 +69,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.tests.ParcelableForToString"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.ParcelableForToString"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/RecursiveList.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/RecursiveList.h index 27180db6..c835bb89 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/RecursiveList.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/RecursiveList.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.tests.RecursiveList"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.RecursiveList"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/StructuredParcelable.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/StructuredParcelable.h index 339c5160..ee17d484 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/StructuredParcelable.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/StructuredParcelable.h @@ -46,8 +46,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.tests.StructuredParcelable.Empty"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.StructuredParcelable.Empty"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -136,8 +136,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.tests.StructuredParcelable"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.StructuredParcelable"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/Union.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/Union.h index a82300f7..b3493e90 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/Union.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/Union.h @@ -111,8 +111,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.tests.Union"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.Union"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/UnionWithFd.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/UnionWithFd.h index c97edf1f..fae77458 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/UnionWithFd.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/UnionWithFd.h @@ -98,8 +98,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.tests.UnionWithFd"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.UnionWithFd"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/ExtendableParcelable.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/ExtendableParcelable.h index cf709f17..18dfb061 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/ExtendableParcelable.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/ExtendableParcelable.h @@ -42,8 +42,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.tests.extension.ExtendableParcelable"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.extension.ExtendableParcelable"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/MyExt.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/MyExt.h index f89954a8..ae311acc 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/MyExt.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/MyExt.h @@ -38,8 +38,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.tests.extension.MyExt"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.extension.MyExt"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/MyExt2.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/MyExt2.h index 7fbae6ba..cfd04c63 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/MyExt2.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/MyExt2.h @@ -43,8 +43,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.tests.extension.MyExt2"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.extension.MyExt2"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/MyExtLike.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/MyExtLike.h index 0ac2bf7a..97a740cf 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/MyExtLike.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/extension/MyExtLike.h @@ -37,8 +37,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.tests.extension.MyExtLike"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.extension.MyExtLike"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/nested/DeeplyNested.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/nested/DeeplyNested.h index 6e280b46..d26c1c19 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/nested/DeeplyNested.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/nested/DeeplyNested.h @@ -48,8 +48,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.tests.nested.DeeplyNested.B.C.D"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.nested.DeeplyNested.B.C.D"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -80,8 +80,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.tests.nested.DeeplyNested.B.C"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.nested.DeeplyNested.B.C"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -112,8 +112,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.tests.nested.DeeplyNested.B"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.nested.DeeplyNested.B"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -147,8 +147,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.tests.nested.DeeplyNested.A"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.nested.DeeplyNested.A"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; @@ -180,8 +180,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.tests.nested.DeeplyNested"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.nested.DeeplyNested"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; 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 1215facf..ae0bbef1 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 @@ -51,8 +51,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.tests.nested.INestedService.Result"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.nested.INestedService.Result"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/nested/ParcelableWithNested.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/nested/ParcelableWithNested.h index 56a3c4d8..b46af40b 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/nested/ParcelableWithNested.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/nested/ParcelableWithNested.h @@ -44,8 +44,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.tests.nested.ParcelableWithNested"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.nested.ParcelableWithNested"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/unions/EnumUnion.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/unions/EnumUnion.h index ef1c93ed..81d93b63 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/unions/EnumUnion.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/unions/EnumUnion.h @@ -104,8 +104,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.tests.unions.EnumUnion"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.unions.EnumUnion"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/unions/UnionInUnion.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/unions/UnionInUnion.h index 9badc3af..50f19cc0 100644 --- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/unions/UnionInUnion.h +++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/unions/UnionInUnion.h @@ -99,8 +99,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.tests.unions.UnionInUnion"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.tests.unions.UnionInUnion"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/include/android/aidl/versioned/tests/BazUnion.h b/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/include/android/aidl/versioned/tests/BazUnion.h index 25e0d16b..6d14f9cc 100644 --- a/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/include/android/aidl/versioned/tests/BazUnion.h +++ b/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/include/android/aidl/versioned/tests/BazUnion.h @@ -96,8 +96,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.versioned.tests.BazUnion"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.versioned.tests.BazUnion"); + return DESCRIPTOR; } inline std::string toString() const { std::ostringstream os; diff --git a/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/include/android/aidl/versioned/tests/Foo.h b/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/include/android/aidl/versioned/tests/Foo.h index 951277eb..983dd7fe 100644 --- a/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/include/android/aidl/versioned/tests/Foo.h +++ b/tests/golden_output/aidl-test-versioned-interface-V1-cpp-source/gen/include/android/aidl/versioned/tests/Foo.h @@ -34,8 +34,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.versioned.tests.Foo"); - return DESCIPTOR; + static const ::android::StaticString16 DESCRIPTOR (u"android.aidl.versioned.tests.Foo"); + 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/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/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; -- cgit v1.2.3