Output is indented

In order to ease the debugging of the generate files, program elements
are indented.

Bug: 110967839
Test: m -j, device boots to the UI and basic functionality works
Test: runtest.sh is successful

Change-Id: I2540d4fa62b8aa4a72bb48074f8ddc3476840eba
diff --git a/ast_cpp.cpp b/ast_cpp.cpp
index 783b0f3..14fa8a6 100644
--- a/ast_cpp.cpp
+++ b/ast_cpp.cpp
@@ -52,14 +52,18 @@
   if (!public_members_.empty())
       to->Write("public:\n");
 
+  to->Indent();
   for (const auto& dec : public_members_)
     dec->Write(to);
+  to->Dedent();
 
   if (!private_members_.empty())
       to->Write("private:\n");
 
+  to->Indent();
   for (const auto& dec : private_members_)
     dec->Write(to);
+  to->Dedent();
 
   to->Write("};  // class %s\n", name_.c_str());
 }
@@ -87,13 +91,15 @@
   } else {
     to->Write("enum %s : %s {\n", enum_name_.c_str(), underlying_type_.c_str());
   }
+  to->Indent();
   for (const auto& field : fields_) {
     if (field.value.empty()) {
-      to->Write("  %s,\n", field.key.c_str());
+      to->Write("%s,\n", field.key.c_str());
     } else {
-      to->Write("  %s = %s,\n", field.key.c_str(), field.value.c_str());
+      to->Write("%s = %s,\n", field.key.c_str(), field.value.c_str());
     }
   }
+  to->Dedent();
   to->Write("};\n");
 }
 
@@ -228,9 +234,11 @@
 
 void StatementBlock::Write(CodeWriter* to) const {
   to->Write("{\n");
+  to->Indent();
   for (const auto& statement : statements_) {
     statement->Write(to);
   }
+  to->Dedent();
   to->Write("}\n");
 }
 
diff --git a/ast_cpp_unittest.cpp b/ast_cpp_unittest.cpp
index aee23b7..ce11c1c 100644
--- a/ast_cpp_unittest.cpp
+++ b/ast_cpp_unittest.cpp
@@ -43,13 +43,13 @@
 
 class TestClass {
 public:
-void NormalMethod(int normalarg, float normal2);
-virtual void SubMethod(int subarg) const;
+  void NormalMethod(int normalarg, float normal2);
+  virtual void SubMethod(int subarg) const;
 };  // class TestClass
 
 class TestSubClass : public TestClass {
 public:
-virtual void SubMethod(int subarg) const;
+  virtual void SubMethod(int subarg) const;
 };  // class TestSubClass
 
 }  // namespace test
@@ -70,13 +70,13 @@
 R"(switch (var) {
 case 2:
 {
-baz;
+  baz;
 }
 break;
 case 1:
 {
-foo;
-bar;
+  foo;
+  bar;
 }
 break;
 }
@@ -84,8 +84,8 @@
 
 const char kExpectedMethodImplOutput[] =
 R"(return_type ClassName::MethodName(arg 1, arg 2, arg 3) const {
-foo;
-bar;
+  foo;
+  bar;
 }
 )";
 }  // namespace
@@ -178,7 +178,7 @@
   StatementBlock block;
   block.AddStatement(unique_ptr<AstNode>(new Statement("foo")));
   block.AddStatement(unique_ptr<AstNode>(new Statement("bar")));
-  CompareGeneratedCode(block, "{\nfoo;\nbar;\n}\n");
+  CompareGeneratedCode(block, "{\n  foo;\n  bar;\n}\n");
 }
 
 TEST_F(AstCppTests, GeneratesConstructorImpl) {
@@ -212,11 +212,11 @@
   IfStatement s(new LiteralExpression("foo"));
   s.OnTrue()->AddLiteral("on true1");
   s.OnFalse()->AddLiteral("on false");
-  CompareGeneratedCode(s, "if (foo) {\non true1;\n}\nelse {\non false;\n}\n");
+  CompareGeneratedCode(s, "if (foo) {\n  on true1;\n}\nelse {\n  on false;\n}\n");
 
   IfStatement s2(new LiteralExpression("bar"));
   s2.OnTrue()->AddLiteral("on true1");
-  CompareGeneratedCode(s2, "if (bar) {\non true1;\n}\n");
+  CompareGeneratedCode(s2, "if (bar) {\n  on true1;\n}\n");
 }
 
 TEST_F(AstCppTests, GeneratesSwitchStatement) {
diff --git a/ast_java.cpp b/ast_java.cpp
index 1ba723c..14636a8 100644
--- a/ast_java.cpp
+++ b/ast_java.cpp
@@ -125,10 +125,12 @@
 
 void StatementBlock::Write(CodeWriter* to) const {
   to->Write("{\n");
+  to->Indent();
   int N = this->statements.size();
   for (int i = 0; i < N; i++) {
     this->statements[i]->Write(to);
   }
+  to->Dedent();
   to->Write("}\n");
 }
 
@@ -360,10 +362,12 @@
   to->Write("switch (");
   this->expression->Write(to);
   to->Write(")\n{\n");
+  to->Indent();
   int N = this->cases.size();
   for (int i = 0; i < N; i++) {
     this->cases[i]->Write(to);
   }
+  to->Dedent();
   to->Write("}\n");
 }
 
@@ -468,12 +472,14 @@
 
   to->Write("\n");
   to->Write("{\n");
+  to->Indent();
 
   N = this->elements.size();
   for (i = 0; i < N; i++) {
     this->elements[i]->Write(to);
   }
 
+  to->Dedent();
   to->Write("}\n");
 }
 
diff --git a/code_writer.cpp b/code_writer.cpp
index 58b1dc1..048dade 100644
--- a/code_writer.cpp
+++ b/code_writer.cpp
@@ -16,29 +16,62 @@
 
 #include "code_writer.h"
 
+#include <fstream>
 #include <iostream>
 #include <stdarg.h>
+#include <vector>
 
 #include <android-base/stringprintf.h>
 
-using std::cerr;
-using std::endl;
-
 namespace android {
 namespace aidl {
 
-namespace {
+std::string CodeWriter::ApplyIndent(const std::string& str) {
+  std::string output;
+  if (!start_of_line_ || str == "\n") {
+    output = str;
+  } else {
+    output = std::string(indent_level_ * 2, ' ') + str;
+  }
+  start_of_line_ = !output.empty() && output.back() == '\n';
+  return output;
+}
+
+bool CodeWriter::Write(const char* format, ...) {
+  va_list ap;
+  va_start(ap, format);
+  std::string formatted;
+  android::base::StringAppendV(&formatted, format, ap);
+  va_end(ap);
+
+  // extract lines. empty line is preserved.
+  std::vector<std::string> lines;
+  size_t pos = 0;
+  while (pos < formatted.size()) {
+    size_t line_end = formatted.find('\n', pos);
+    if (line_end != std::string::npos) {
+      lines.push_back(formatted.substr(pos, (line_end - pos) + 1));
+      pos = line_end + 1;
+    } else {
+      lines.push_back(formatted.substr(pos));
+      break;
+    }
+  }
+
+  std::string indented;
+  for (auto line : lines) {
+    indented.append(ApplyIndent(line));
+  }
+  return Output(indented);
+}
 
 class StringCodeWriter : public CodeWriter {
  public:
   explicit StringCodeWriter(std::string* output_buffer) : output_(output_buffer) {}
   virtual ~StringCodeWriter() = default;
 
-  bool Write(const char* format, ...) override {
-    va_list ap;
-    va_start(ap, format);
-    android::base::StringAppendV(output_, format, ap);
-    va_end(ap);
+  bool Output(const std::string& str) override {
+    output_->append(str);
     return true;
   }
 
@@ -50,61 +83,47 @@
 
 class FileCodeWriter : public CodeWriter {
  public:
-  FileCodeWriter(FILE* output_file, bool close_on_destruction)
-      : output_(output_file),
-        close_on_destruction_(close_on_destruction) {}
-  virtual ~FileCodeWriter() {
-    if (close_on_destruction_ && output_ != nullptr) {
-      fclose(output_);
+  explicit FileCodeWriter(const std::string& filename) : cout_(std::cout) {
+    if (filename == "-") {
+      to_stdout_ = true;
+    } else {
+      to_stdout_ = false;
+      fileout_.open(filename, std::ofstream::out |
+                    std::ofstream::binary);
+      if (fileout_.fail()) {
+        std::cerr << "unable to open " << filename << " for write" << std::endl;
+      }
     }
   }
 
-  bool Write(const char* format, ...) override {
-    bool success;
-    va_list ap;
-    va_start(ap, format);
-    success = vfprintf(output_, format, ap) >= 0;
-    va_end(ap);
-    no_error_ = no_error_ && success;
-    return success;
+  bool Output(const std::string& str) override {
+    if (to_stdout_) {
+      cout_ << str;
+    } else {
+      fileout_ << str;
+    }
+    return TestSuccess();
   }
 
   bool Close() override {
-    if (output_ != nullptr) {
-      no_error_ = fclose(output_) == 0 && no_error_;
-      output_ = nullptr;
+    if (!to_stdout_) {
+      fileout_.close();
     }
-    return no_error_;
+    return TestSuccess();
+  }
+
+  bool TestSuccess() const {
+    return to_stdout_ ? true : !fileout_.fail();
   }
 
  private:
-  bool no_error_ = true;
-  FILE* output_;
-  bool close_on_destruction_;
+  std::ostream& cout_;
+  std::ofstream fileout_;
+  bool to_stdout_;
 };  // class StringCodeWriter
 
-}  // namespace
-
 CodeWriterPtr GetFileWriter(const std::string& output_file) {
-  CodeWriterPtr result;
-  FILE* to = nullptr;
-  bool close_on_destruction = true;
-  if (output_file == "-") {
-    to = stdout;
-    close_on_destruction = false;
-  } else {
-    // open file in binary mode to ensure that the tool produces the
-    // same output on all platforms !!
-    to = fopen(output_file.c_str(), "wb");
-  }
-
-  if (to != nullptr) {
-    result.reset(new FileCodeWriter(to, close_on_destruction));
-  } else {
-    cerr << "unable to open " << output_file << " for write" << endl;
-  }
-
-  return result;
+  return CodeWriterPtr(new FileCodeWriter(output_file));
 }
 
 CodeWriterPtr GetStringWriter(std::string* output_buffer) {
diff --git a/code_writer.h b/code_writer.h
index 4b2fe16..73e84e3 100644
--- a/code_writer.h
+++ b/code_writer.h
@@ -31,9 +31,19 @@
  public:
   // Write a formatted string to this writer in the usual printf sense.
   // Returns false on error.
-  virtual bool Write(const char* format, ...) = 0;
+  virtual bool Write(const char* format, ...);
   virtual bool Close() = 0;
   virtual ~CodeWriter() = default;
+  inline void Indent() { indent_level_++; }
+  inline void Dedent() { indent_level_--; }
+ protected:
+  // Actuall writes str which is formatted and properly indented
+  // to the actual medium (file, string, etc.)
+  virtual bool Output(const std::string& str) = 0;
+ private:
+  std::string ApplyIndent(const std::string& str);
+  int indent_level_ {0};
+  bool start_of_line_ {true};
 };  // class CodeWriter
 
 using CodeWriterPtr = std::unique_ptr<CodeWriter>;
diff --git a/generate_cpp_unittest.cpp b/generate_cpp_unittest.cpp
index 32e9362..209f173 100644
--- a/generate_cpp_unittest.cpp
+++ b/generate_cpp_unittest.cpp
@@ -69,16 +69,16 @@
 
 class BpComplexTypeInterface : public ::android::BpInterface<IComplexTypeInterface> {
 public:
-explicit BpComplexTypeInterface(const ::android::sp<::android::IBinder>& _aidl_impl);
-virtual ~BpComplexTypeInterface() = default;
-::android::binder::Status Send(const ::std::unique_ptr<::std::vector<int32_t>>& goes_in, ::std::vector<double>* goes_in_and_out, ::std::vector<bool>* goes_out, ::std::vector<int32_t>* _aidl_return) override;
-::android::binder::Status Piff(int32_t times) override;
-::android::binder::Status TakesABinder(const ::android::sp<::foo::IFooType>& f, ::android::sp<::foo::IFooType>* _aidl_return) override;
-::android::binder::Status NullableBinder(::android::sp<::foo::IFooType>* _aidl_return) override;
-::android::binder::Status StringListMethod(const ::std::vector<::android::String16>& input, ::std::vector<::android::String16>* output, ::std::vector<::android::String16>* _aidl_return) override;
-::android::binder::Status BinderListMethod(const ::std::vector<::android::sp<::android::IBinder>>& input, ::std::vector<::android::sp<::android::IBinder>>* output, ::std::vector<::android::sp<::android::IBinder>>* _aidl_return) override;
-::android::binder::Status TakesAFileDescriptor(const ::android::base::unique_fd& f, ::android::base::unique_fd* _aidl_return) override;
-::android::binder::Status TakesAFileDescriptorArray(const ::std::vector<::android::base::unique_fd>& f, ::std::vector<::android::base::unique_fd>* _aidl_return) override;
+  explicit BpComplexTypeInterface(const ::android::sp<::android::IBinder>& _aidl_impl);
+  virtual ~BpComplexTypeInterface() = default;
+  ::android::binder::Status Send(const ::std::unique_ptr<::std::vector<int32_t>>& goes_in, ::std::vector<double>* goes_in_and_out, ::std::vector<bool>* goes_out, ::std::vector<int32_t>* _aidl_return) override;
+  ::android::binder::Status Piff(int32_t times) override;
+  ::android::binder::Status TakesABinder(const ::android::sp<::foo::IFooType>& f, ::android::sp<::foo::IFooType>* _aidl_return) override;
+  ::android::binder::Status NullableBinder(::android::sp<::foo::IFooType>* _aidl_return) override;
+  ::android::binder::Status StringListMethod(const ::std::vector<::android::String16>& input, ::std::vector<::android::String16>* output, ::std::vector<::android::String16>* _aidl_return) override;
+  ::android::binder::Status BinderListMethod(const ::std::vector<::android::sp<::android::IBinder>>& input, ::std::vector<::android::sp<::android::IBinder>>* output, ::std::vector<::android::sp<::android::IBinder>>* _aidl_return) override;
+  ::android::binder::Status TakesAFileDescriptor(const ::android::base::unique_fd& f, ::android::base::unique_fd* _aidl_return) override;
+  ::android::binder::Status TakesAFileDescriptorArray(const ::std::vector<::android::base::unique_fd>& f, ::std::vector<::android::base::unique_fd>* _aidl_return) override;
 };  // class BpComplexTypeInterface
 
 }  // namespace os
@@ -101,276 +101,276 @@
 }
 
 ::android::binder::Status BpComplexTypeInterface::Send(const ::std::unique_ptr<::std::vector<int32_t>>& goes_in, ::std::vector<double>* goes_in_and_out, ::std::vector<bool>* goes_out, ::std::vector<int32_t>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeInt32Vector(goes_in);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeDoubleVector(*goes_in_and_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeVectorSize(*goes_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::SEND, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readInt32Vector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_reply.readDoubleVector(goes_in_and_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_reply.readBoolVector(goes_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeInt32Vector(goes_in);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeDoubleVector(*goes_in_and_out);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeVectorSize(*goes_out);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::SEND, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readInt32Vector(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_reply.readDoubleVector(goes_in_and_out);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_reply.readBoolVector(goes_out);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::Piff(int32_t times) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeInt32(times);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::PIFF, _aidl_data, &_aidl_reply, ::android::IBinder::FLAG_ONEWAY);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeInt32(times);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::PIFF, _aidl_data, &_aidl_reply, ::android::IBinder::FLAG_ONEWAY);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::TakesABinder(const ::android::sp<::foo::IFooType>& f, ::android::sp<::foo::IFooType>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeStrongBinder(::foo::IFooType::asBinder(f));
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::TAKESABINDER, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readStrongBinder(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeStrongBinder(::foo::IFooType::asBinder(f));
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::TAKESABINDER, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readStrongBinder(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::NullableBinder(::android::sp<::foo::IFooType>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::NULLABLEBINDER, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readNullableStrongBinder(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::NULLABLEBINDER, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readNullableStrongBinder(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::StringListMethod(const ::std::vector<::android::String16>& input, ::std::vector<::android::String16>* output, ::std::vector<::android::String16>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeString16Vector(input);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::STRINGLISTMETHOD, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readString16Vector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_reply.readString16Vector(output);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeString16Vector(input);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::STRINGLISTMETHOD, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readString16Vector(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_reply.readString16Vector(output);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::BinderListMethod(const ::std::vector<::android::sp<::android::IBinder>>& input, ::std::vector<::android::sp<::android::IBinder>>* output, ::std::vector<::android::sp<::android::IBinder>>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeStrongBinderVector(input);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::BINDERLISTMETHOD, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readStrongBinderVector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_reply.readStrongBinderVector(output);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeStrongBinderVector(input);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::BINDERLISTMETHOD, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readStrongBinderVector(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_reply.readStrongBinderVector(output);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::TakesAFileDescriptor(const ::android::base::unique_fd& f, ::android::base::unique_fd* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeUniqueFileDescriptor(f);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::TAKESAFILEDESCRIPTOR, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readUniqueFileDescriptor(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeUniqueFileDescriptor(f);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::TAKESAFILEDESCRIPTOR, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readUniqueFileDescriptor(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::TakesAFileDescriptorArray(const ::std::vector<::android::base::unique_fd>& f, ::std::vector<::android::base::unique_fd>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeUniqueFileDescriptorVector(f);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::TAKESAFILEDESCRIPTORARRAY, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readUniqueFileDescriptorVector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeUniqueFileDescriptorVector(f);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::TAKESAFILEDESCRIPTORARRAY, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readUniqueFileDescriptorVector(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 }  // namespace os
@@ -391,284 +391,284 @@
 }
 
 ::android::binder::Status BpComplexTypeInterface::Send(const ::std::unique_ptr<::std::vector<int32_t>>& goes_in, ::std::vector<double>* goes_in_and_out, ::std::vector<bool>* goes_out, ::std::vector<int32_t>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::Send::cppClient");
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeInt32Vector(goes_in);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeDoubleVector(*goes_in_and_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeVectorSize(*goes_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::SEND, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readInt32Vector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_reply.readDoubleVector(goes_in_and_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_reply.readBoolVector(goes_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::Send::cppClient");
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeInt32Vector(goes_in);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeDoubleVector(*goes_in_and_out);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeVectorSize(*goes_out);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::SEND, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readInt32Vector(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_reply.readDoubleVector(goes_in_and_out);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_reply.readBoolVector(goes_out);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::Piff(int32_t times) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::Piff::cppClient");
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeInt32(times);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::PIFF, _aidl_data, &_aidl_reply, ::android::IBinder::FLAG_ONEWAY);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::Piff::cppClient");
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeInt32(times);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::PIFF, _aidl_data, &_aidl_reply, ::android::IBinder::FLAG_ONEWAY);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::TakesABinder(const ::android::sp<::foo::IFooType>& f, ::android::sp<::foo::IFooType>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::TakesABinder::cppClient");
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeStrongBinder(::foo::IFooType::asBinder(f));
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::TAKESABINDER, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readStrongBinder(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::TakesABinder::cppClient");
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeStrongBinder(::foo::IFooType::asBinder(f));
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::TAKESABINDER, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readStrongBinder(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::NullableBinder(::android::sp<::foo::IFooType>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::NullableBinder::cppClient");
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::NULLABLEBINDER, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readNullableStrongBinder(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::NullableBinder::cppClient");
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::NULLABLEBINDER, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readNullableStrongBinder(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::StringListMethod(const ::std::vector<::android::String16>& input, ::std::vector<::android::String16>* output, ::std::vector<::android::String16>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::StringListMethod::cppClient");
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeString16Vector(input);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::STRINGLISTMETHOD, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readString16Vector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_reply.readString16Vector(output);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::StringListMethod::cppClient");
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeString16Vector(input);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::STRINGLISTMETHOD, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readString16Vector(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_reply.readString16Vector(output);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::BinderListMethod(const ::std::vector<::android::sp<::android::IBinder>>& input, ::std::vector<::android::sp<::android::IBinder>>* output, ::std::vector<::android::sp<::android::IBinder>>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::BinderListMethod::cppClient");
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeStrongBinderVector(input);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::BINDERLISTMETHOD, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readStrongBinderVector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_reply.readStrongBinderVector(output);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::BinderListMethod::cppClient");
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeStrongBinderVector(input);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::BINDERLISTMETHOD, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readStrongBinderVector(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_reply.readStrongBinderVector(output);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::TakesAFileDescriptor(const ::android::base::unique_fd& f, ::android::base::unique_fd* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::TakesAFileDescriptor::cppClient");
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeUniqueFileDescriptor(f);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::TAKESAFILEDESCRIPTOR, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readUniqueFileDescriptor(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::TakesAFileDescriptor::cppClient");
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeUniqueFileDescriptor(f);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::TAKESAFILEDESCRIPTOR, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readUniqueFileDescriptor(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpComplexTypeInterface::TakesAFileDescriptorArray(const ::std::vector<::android::base::unique_fd>& f, ::std::vector<::android::base::unique_fd>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::TakesAFileDescriptorArray::cppClient");
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeUniqueFileDescriptorVector(f);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IComplexTypeInterface::TAKESAFILEDESCRIPTORARRAY, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readUniqueFileDescriptorVector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  ScopedTrace _aidl_trace(ATRACE_TAG_AIDL, "IComplexTypeInterface::TakesAFileDescriptorArray::cppClient");
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeUniqueFileDescriptorVector(f);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IComplexTypeInterface::TAKESAFILEDESCRIPTORARRAY, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readUniqueFileDescriptorVector(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 }  // namespace os
@@ -689,7 +689,7 @@
 
 class BnComplexTypeInterface : public ::android::BnInterface<IComplexTypeInterface> {
 public:
-::android::status_t onTransact(uint32_t _aidl_code, const ::android::Parcel& _aidl_data, ::android::Parcel* _aidl_reply, uint32_t _aidl_flags = 0) override;
+  ::android::status_t onTransact(uint32_t _aidl_code, const ::android::Parcel& _aidl_data, ::android::Parcel* _aidl_reply, uint32_t _aidl_flags = 0) override;
 };  // class BnComplexTypeInterface
 
 }  // namespace os
@@ -708,237 +708,237 @@
 namespace os {
 
 ::android::status_t BnComplexTypeInterface::onTransact(uint32_t _aidl_code, const ::android::Parcel& _aidl_data, ::android::Parcel* _aidl_reply, uint32_t _aidl_flags) {
-::android::status_t _aidl_ret_status = ::android::OK;
-switch (_aidl_code) {
-case Call::SEND:
-{
-::std::unique_ptr<::std::vector<int32_t>> in_goes_in;
-::std::vector<double> in_goes_in_and_out;
-::std::vector<bool> out_goes_out;
-::std::vector<int32_t> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readInt32Vector(&in_goes_in);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-_aidl_ret_status = _aidl_data.readDoubleVector(&in_goes_in_and_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-_aidl_ret_status = _aidl_data.resizeOutVector(&out_goes_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-::android::binder::Status _aidl_status(Send(in_goes_in, &in_goes_in_and_out, &out_goes_out, &_aidl_return));
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeInt32Vector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeDoubleVector(in_goes_in_and_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeBoolVector(out_goes_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::PIFF:
-{
-int32_t in_times;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readInt32(&in_times);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-::android::binder::Status _aidl_status(Piff(in_times));
-}
-break;
-case Call::TAKESABINDER:
-{
-::android::sp<::foo::IFooType> in_f;
-::android::sp<::foo::IFooType> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readStrongBinder(&in_f);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-::android::binder::Status _aidl_status(TakesABinder(in_f, &_aidl_return));
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeStrongBinder(::foo::IFooType::asBinder(_aidl_return));
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::NULLABLEBINDER:
-{
-::android::sp<::foo::IFooType> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-::android::binder::Status _aidl_status(NullableBinder(&_aidl_return));
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeStrongBinder(::foo::IFooType::asBinder(_aidl_return));
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::STRINGLISTMETHOD:
-{
-::std::vector<::android::String16> in_input;
-::std::vector<::android::String16> out_output;
-::std::vector<::android::String16> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readString16Vector(&in_input);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-::android::binder::Status _aidl_status(StringListMethod(in_input, &out_output, &_aidl_return));
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeString16Vector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeString16Vector(out_output);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::BINDERLISTMETHOD:
-{
-::std::vector<::android::sp<::android::IBinder>> in_input;
-::std::vector<::android::sp<::android::IBinder>> out_output;
-::std::vector<::android::sp<::android::IBinder>> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readStrongBinderVector(&in_input);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-::android::binder::Status _aidl_status(BinderListMethod(in_input, &out_output, &_aidl_return));
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeStrongBinderVector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeStrongBinderVector(out_output);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::TAKESAFILEDESCRIPTOR:
-{
-::android::base::unique_fd in_f;
-::android::base::unique_fd _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readUniqueFileDescriptor(&in_f);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-::android::binder::Status _aidl_status(TakesAFileDescriptor(in_f, &_aidl_return));
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeUniqueFileDescriptor(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::TAKESAFILEDESCRIPTORARRAY:
-{
-::std::vector<::android::base::unique_fd> in_f;
-::std::vector<::android::base::unique_fd> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readUniqueFileDescriptorVector(&in_f);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-::android::binder::Status _aidl_status(TakesAFileDescriptorArray(in_f, &_aidl_return));
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeUniqueFileDescriptorVector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-default:
-{
-_aidl_ret_status = ::android::BBinder::onTransact(_aidl_code, _aidl_data, _aidl_reply, _aidl_flags);
-}
-break;
-}
-if (_aidl_ret_status == ::android::UNEXPECTED_NULL) {
-_aidl_ret_status = ::android::binder::Status::fromExceptionCode(::android::binder::Status::EX_NULL_POINTER).writeToParcel(_aidl_reply);
-}
-return _aidl_ret_status;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  switch (_aidl_code) {
+  case Call::SEND:
+  {
+    ::std::unique_ptr<::std::vector<int32_t>> in_goes_in;
+    ::std::vector<double> in_goes_in_and_out;
+    ::std::vector<bool> out_goes_out;
+    ::std::vector<int32_t> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readInt32Vector(&in_goes_in);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readDoubleVector(&in_goes_in_and_out);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    _aidl_ret_status = _aidl_data.resizeOutVector(&out_goes_out);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    ::android::binder::Status _aidl_status(Send(in_goes_in, &in_goes_in_and_out, &out_goes_out, &_aidl_return));
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeInt32Vector(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeDoubleVector(in_goes_in_and_out);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeBoolVector(out_goes_out);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::PIFF:
+  {
+    int32_t in_times;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readInt32(&in_times);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    ::android::binder::Status _aidl_status(Piff(in_times));
+  }
+  break;
+  case Call::TAKESABINDER:
+  {
+    ::android::sp<::foo::IFooType> in_f;
+    ::android::sp<::foo::IFooType> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readStrongBinder(&in_f);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    ::android::binder::Status _aidl_status(TakesABinder(in_f, &_aidl_return));
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeStrongBinder(::foo::IFooType::asBinder(_aidl_return));
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::NULLABLEBINDER:
+  {
+    ::android::sp<::foo::IFooType> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    ::android::binder::Status _aidl_status(NullableBinder(&_aidl_return));
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeStrongBinder(::foo::IFooType::asBinder(_aidl_return));
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::STRINGLISTMETHOD:
+  {
+    ::std::vector<::android::String16> in_input;
+    ::std::vector<::android::String16> out_output;
+    ::std::vector<::android::String16> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readString16Vector(&in_input);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    ::android::binder::Status _aidl_status(StringListMethod(in_input, &out_output, &_aidl_return));
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeString16Vector(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeString16Vector(out_output);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::BINDERLISTMETHOD:
+  {
+    ::std::vector<::android::sp<::android::IBinder>> in_input;
+    ::std::vector<::android::sp<::android::IBinder>> out_output;
+    ::std::vector<::android::sp<::android::IBinder>> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readStrongBinderVector(&in_input);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    ::android::binder::Status _aidl_status(BinderListMethod(in_input, &out_output, &_aidl_return));
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeStrongBinderVector(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeStrongBinderVector(out_output);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::TAKESAFILEDESCRIPTOR:
+  {
+    ::android::base::unique_fd in_f;
+    ::android::base::unique_fd _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readUniqueFileDescriptor(&in_f);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    ::android::binder::Status _aidl_status(TakesAFileDescriptor(in_f, &_aidl_return));
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeUniqueFileDescriptor(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::TAKESAFILEDESCRIPTORARRAY:
+  {
+    ::std::vector<::android::base::unique_fd> in_f;
+    ::std::vector<::android::base::unique_fd> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readUniqueFileDescriptorVector(&in_f);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    ::android::binder::Status _aidl_status(TakesAFileDescriptorArray(in_f, &_aidl_return));
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeUniqueFileDescriptorVector(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  default:
+  {
+    _aidl_ret_status = ::android::BBinder::onTransact(_aidl_code, _aidl_data, _aidl_reply, _aidl_flags);
+  }
+  break;
+  }
+  if (_aidl_ret_status == ::android::UNEXPECTED_NULL) {
+    _aidl_ret_status = ::android::binder::Status::fromExceptionCode(::android::binder::Status::EX_NULL_POINTER).writeToParcel(_aidl_reply);
+  }
+  return _aidl_ret_status;
 }
 
 }  // namespace os
@@ -955,253 +955,253 @@
 namespace os {
 
 ::android::status_t BnComplexTypeInterface::onTransact(uint32_t _aidl_code, const ::android::Parcel& _aidl_data, ::android::Parcel* _aidl_reply, uint32_t _aidl_flags) {
-::android::status_t _aidl_ret_status = ::android::OK;
-switch (_aidl_code) {
-case Call::SEND:
-{
-::std::unique_ptr<::std::vector<int32_t>> in_goes_in;
-::std::vector<double> in_goes_in_and_out;
-::std::vector<bool> out_goes_out;
-::std::vector<int32_t> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readInt32Vector(&in_goes_in);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-_aidl_ret_status = _aidl_data.readDoubleVector(&in_goes_in_and_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-_aidl_ret_status = _aidl_data.resizeOutVector(&out_goes_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::Send::cppServer");
-::android::binder::Status _aidl_status(Send(in_goes_in, &in_goes_in_and_out, &out_goes_out, &_aidl_return));
-atrace_end(ATRACE_TAG_AIDL);
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeInt32Vector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeDoubleVector(in_goes_in_and_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeBoolVector(out_goes_out);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::PIFF:
-{
-int32_t in_times;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readInt32(&in_times);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::Piff::cppServer");
-::android::binder::Status _aidl_status(Piff(in_times));
-atrace_end(ATRACE_TAG_AIDL);
-}
-break;
-case Call::TAKESABINDER:
-{
-::android::sp<::foo::IFooType> in_f;
-::android::sp<::foo::IFooType> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readStrongBinder(&in_f);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::TakesABinder::cppServer");
-::android::binder::Status _aidl_status(TakesABinder(in_f, &_aidl_return));
-atrace_end(ATRACE_TAG_AIDL);
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeStrongBinder(::foo::IFooType::asBinder(_aidl_return));
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::NULLABLEBINDER:
-{
-::android::sp<::foo::IFooType> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::NullableBinder::cppServer");
-::android::binder::Status _aidl_status(NullableBinder(&_aidl_return));
-atrace_end(ATRACE_TAG_AIDL);
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeStrongBinder(::foo::IFooType::asBinder(_aidl_return));
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::STRINGLISTMETHOD:
-{
-::std::vector<::android::String16> in_input;
-::std::vector<::android::String16> out_output;
-::std::vector<::android::String16> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readString16Vector(&in_input);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::StringListMethod::cppServer");
-::android::binder::Status _aidl_status(StringListMethod(in_input, &out_output, &_aidl_return));
-atrace_end(ATRACE_TAG_AIDL);
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeString16Vector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeString16Vector(out_output);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::BINDERLISTMETHOD:
-{
-::std::vector<::android::sp<::android::IBinder>> in_input;
-::std::vector<::android::sp<::android::IBinder>> out_output;
-::std::vector<::android::sp<::android::IBinder>> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readStrongBinderVector(&in_input);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::BinderListMethod::cppServer");
-::android::binder::Status _aidl_status(BinderListMethod(in_input, &out_output, &_aidl_return));
-atrace_end(ATRACE_TAG_AIDL);
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeStrongBinderVector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeStrongBinderVector(out_output);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::TAKESAFILEDESCRIPTOR:
-{
-::android::base::unique_fd in_f;
-::android::base::unique_fd _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readUniqueFileDescriptor(&in_f);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::TakesAFileDescriptor::cppServer");
-::android::binder::Status _aidl_status(TakesAFileDescriptor(in_f, &_aidl_return));
-atrace_end(ATRACE_TAG_AIDL);
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeUniqueFileDescriptor(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::TAKESAFILEDESCRIPTORARRAY:
-{
-::std::vector<::android::base::unique_fd> in_f;
-::std::vector<::android::base::unique_fd> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readUniqueFileDescriptorVector(&in_f);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::TakesAFileDescriptorArray::cppServer");
-::android::binder::Status _aidl_status(TakesAFileDescriptorArray(in_f, &_aidl_return));
-atrace_end(ATRACE_TAG_AIDL);
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeUniqueFileDescriptorVector(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-default:
-{
-_aidl_ret_status = ::android::BBinder::onTransact(_aidl_code, _aidl_data, _aidl_reply, _aidl_flags);
-}
-break;
-}
-if (_aidl_ret_status == ::android::UNEXPECTED_NULL) {
-_aidl_ret_status = ::android::binder::Status::fromExceptionCode(::android::binder::Status::EX_NULL_POINTER).writeToParcel(_aidl_reply);
-}
-return _aidl_ret_status;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  switch (_aidl_code) {
+  case Call::SEND:
+  {
+    ::std::unique_ptr<::std::vector<int32_t>> in_goes_in;
+    ::std::vector<double> in_goes_in_and_out;
+    ::std::vector<bool> out_goes_out;
+    ::std::vector<int32_t> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readInt32Vector(&in_goes_in);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readDoubleVector(&in_goes_in_and_out);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    _aidl_ret_status = _aidl_data.resizeOutVector(&out_goes_out);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::Send::cppServer");
+    ::android::binder::Status _aidl_status(Send(in_goes_in, &in_goes_in_and_out, &out_goes_out, &_aidl_return));
+    atrace_end(ATRACE_TAG_AIDL);
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeInt32Vector(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeDoubleVector(in_goes_in_and_out);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeBoolVector(out_goes_out);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::PIFF:
+  {
+    int32_t in_times;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readInt32(&in_times);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::Piff::cppServer");
+    ::android::binder::Status _aidl_status(Piff(in_times));
+    atrace_end(ATRACE_TAG_AIDL);
+  }
+  break;
+  case Call::TAKESABINDER:
+  {
+    ::android::sp<::foo::IFooType> in_f;
+    ::android::sp<::foo::IFooType> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readStrongBinder(&in_f);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::TakesABinder::cppServer");
+    ::android::binder::Status _aidl_status(TakesABinder(in_f, &_aidl_return));
+    atrace_end(ATRACE_TAG_AIDL);
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeStrongBinder(::foo::IFooType::asBinder(_aidl_return));
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::NULLABLEBINDER:
+  {
+    ::android::sp<::foo::IFooType> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::NullableBinder::cppServer");
+    ::android::binder::Status _aidl_status(NullableBinder(&_aidl_return));
+    atrace_end(ATRACE_TAG_AIDL);
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeStrongBinder(::foo::IFooType::asBinder(_aidl_return));
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::STRINGLISTMETHOD:
+  {
+    ::std::vector<::android::String16> in_input;
+    ::std::vector<::android::String16> out_output;
+    ::std::vector<::android::String16> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readString16Vector(&in_input);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::StringListMethod::cppServer");
+    ::android::binder::Status _aidl_status(StringListMethod(in_input, &out_output, &_aidl_return));
+    atrace_end(ATRACE_TAG_AIDL);
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeString16Vector(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeString16Vector(out_output);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::BINDERLISTMETHOD:
+  {
+    ::std::vector<::android::sp<::android::IBinder>> in_input;
+    ::std::vector<::android::sp<::android::IBinder>> out_output;
+    ::std::vector<::android::sp<::android::IBinder>> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readStrongBinderVector(&in_input);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::BinderListMethod::cppServer");
+    ::android::binder::Status _aidl_status(BinderListMethod(in_input, &out_output, &_aidl_return));
+    atrace_end(ATRACE_TAG_AIDL);
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeStrongBinderVector(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeStrongBinderVector(out_output);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::TAKESAFILEDESCRIPTOR:
+  {
+    ::android::base::unique_fd in_f;
+    ::android::base::unique_fd _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readUniqueFileDescriptor(&in_f);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::TakesAFileDescriptor::cppServer");
+    ::android::binder::Status _aidl_status(TakesAFileDescriptor(in_f, &_aidl_return));
+    atrace_end(ATRACE_TAG_AIDL);
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeUniqueFileDescriptor(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::TAKESAFILEDESCRIPTORARRAY:
+  {
+    ::std::vector<::android::base::unique_fd> in_f;
+    ::std::vector<::android::base::unique_fd> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readUniqueFileDescriptorVector(&in_f);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    atrace_begin(ATRACE_TAG_AIDL, "IComplexTypeInterface::TakesAFileDescriptorArray::cppServer");
+    ::android::binder::Status _aidl_status(TakesAFileDescriptorArray(in_f, &_aidl_return));
+    atrace_end(ATRACE_TAG_AIDL);
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeUniqueFileDescriptorVector(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  default:
+  {
+    _aidl_ret_status = ::android::BBinder::onTransact(_aidl_code, _aidl_data, _aidl_reply, _aidl_flags);
+  }
+  break;
+  }
+  if (_aidl_ret_status == ::android::UNEXPECTED_NULL) {
+    _aidl_ret_status = ::android::binder::Status::fromExceptionCode(::android::binder::Status::EX_NULL_POINTER).writeToParcel(_aidl_reply);
+  }
+  return _aidl_ret_status;
 }
 
 }  // namespace os
@@ -1230,28 +1230,28 @@
 
 class IComplexTypeInterface : public ::android::IInterface {
 public:
-DECLARE_META_INTERFACE(ComplexTypeInterface)
-enum  : int32_t {
-  MY_CONSTANT = 3,
-};
-virtual ::android::binder::Status Send(const ::std::unique_ptr<::std::vector<int32_t>>& goes_in, ::std::vector<double>* goes_in_and_out, ::std::vector<bool>* goes_out, ::std::vector<int32_t>* _aidl_return) = 0;
-virtual ::android::binder::Status Piff(int32_t times) = 0;
-virtual ::android::binder::Status TakesABinder(const ::android::sp<::foo::IFooType>& f, ::android::sp<::foo::IFooType>* _aidl_return) = 0;
-virtual ::android::binder::Status NullableBinder(::android::sp<::foo::IFooType>* _aidl_return) = 0;
-virtual ::android::binder::Status StringListMethod(const ::std::vector<::android::String16>& input, ::std::vector<::android::String16>* output, ::std::vector<::android::String16>* _aidl_return) = 0;
-virtual ::android::binder::Status BinderListMethod(const ::std::vector<::android::sp<::android::IBinder>>& input, ::std::vector<::android::sp<::android::IBinder>>* output, ::std::vector<::android::sp<::android::IBinder>>* _aidl_return) = 0;
-virtual ::android::binder::Status TakesAFileDescriptor(const ::android::base::unique_fd& f, ::android::base::unique_fd* _aidl_return) = 0;
-virtual ::android::binder::Status TakesAFileDescriptorArray(const ::std::vector<::android::base::unique_fd>& f, ::std::vector<::android::base::unique_fd>* _aidl_return) = 0;
-enum Call {
-  SEND = ::android::IBinder::FIRST_CALL_TRANSACTION + 0,
-  PIFF = ::android::IBinder::FIRST_CALL_TRANSACTION + 1,
-  TAKESABINDER = ::android::IBinder::FIRST_CALL_TRANSACTION + 2,
-  NULLABLEBINDER = ::android::IBinder::FIRST_CALL_TRANSACTION + 3,
-  STRINGLISTMETHOD = ::android::IBinder::FIRST_CALL_TRANSACTION + 4,
-  BINDERLISTMETHOD = ::android::IBinder::FIRST_CALL_TRANSACTION + 5,
-  TAKESAFILEDESCRIPTOR = ::android::IBinder::FIRST_CALL_TRANSACTION + 6,
-  TAKESAFILEDESCRIPTORARRAY = ::android::IBinder::FIRST_CALL_TRANSACTION + 7,
-};
+  DECLARE_META_INTERFACE(ComplexTypeInterface)
+  enum  : int32_t {
+    MY_CONSTANT = 3,
+  };
+  virtual ::android::binder::Status Send(const ::std::unique_ptr<::std::vector<int32_t>>& goes_in, ::std::vector<double>* goes_in_and_out, ::std::vector<bool>* goes_out, ::std::vector<int32_t>* _aidl_return) = 0;
+  virtual ::android::binder::Status Piff(int32_t times) = 0;
+  virtual ::android::binder::Status TakesABinder(const ::android::sp<::foo::IFooType>& f, ::android::sp<::foo::IFooType>* _aidl_return) = 0;
+  virtual ::android::binder::Status NullableBinder(::android::sp<::foo::IFooType>* _aidl_return) = 0;
+  virtual ::android::binder::Status StringListMethod(const ::std::vector<::android::String16>& input, ::std::vector<::android::String16>* output, ::std::vector<::android::String16>* _aidl_return) = 0;
+  virtual ::android::binder::Status BinderListMethod(const ::std::vector<::android::sp<::android::IBinder>>& input, ::std::vector<::android::sp<::android::IBinder>>* output, ::std::vector<::android::sp<::android::IBinder>>* _aidl_return) = 0;
+  virtual ::android::binder::Status TakesAFileDescriptor(const ::android::base::unique_fd& f, ::android::base::unique_fd* _aidl_return) = 0;
+  virtual ::android::binder::Status TakesAFileDescriptorArray(const ::std::vector<::android::base::unique_fd>& f, ::std::vector<::android::base::unique_fd>* _aidl_return) = 0;
+  enum Call {
+    SEND = ::android::IBinder::FIRST_CALL_TRANSACTION + 0,
+    PIFF = ::android::IBinder::FIRST_CALL_TRANSACTION + 1,
+    TAKESABINDER = ::android::IBinder::FIRST_CALL_TRANSACTION + 2,
+    NULLABLEBINDER = ::android::IBinder::FIRST_CALL_TRANSACTION + 3,
+    STRINGLISTMETHOD = ::android::IBinder::FIRST_CALL_TRANSACTION + 4,
+    BINDERLISTMETHOD = ::android::IBinder::FIRST_CALL_TRANSACTION + 5,
+    TAKESAFILEDESCRIPTOR = ::android::IBinder::FIRST_CALL_TRANSACTION + 6,
+    TAKESAFILEDESCRIPTORARRAY = ::android::IBinder::FIRST_CALL_TRANSACTION + 7,
+  };
 };  // class IComplexTypeInterface
 
 }  // namespace os
diff --git a/tests/fake_io_delegate.cpp b/tests/fake_io_delegate.cpp
index c5575f6..3d1f05f 100644
--- a/tests/fake_io_delegate.cpp
+++ b/tests/fake_io_delegate.cpp
@@ -36,6 +36,7 @@
 class BrokenCodeWriter : public CodeWriter {
   bool Write(const char* /* format */, ...) override {  return true; }
   bool Close() override { return false; }
+  bool Output(const std::string& str) override { return true; }
   virtual ~BrokenCodeWriter() = default;
 };  // class BrokenCodeWriter
 
diff --git a/tests/test_data_example_interface.cpp b/tests/test_data_example_interface.cpp
index 9b0e0ee..ce7e041 100644
--- a/tests/test_data_example_interface.cpp
+++ b/tests/test_data_example_interface.cpp
@@ -121,367 +121,367 @@
 package android.test;
 public interface IExampleInterface extends android.os.IInterface
 {
-/** Local-side IPC implementation stub class. */
-public static abstract class Stub extends android.os.Binder implements android.test.IExampleInterface
-{
-private static final java.lang.String DESCRIPTOR = "android.test.IExampleInterface";
-/** Construct the stub at attach it to the interface. */
-public Stub()
-{
-this.attachInterface(this, DESCRIPTOR);
-}
-/**
- * Cast an IBinder object into an android.test.IExampleInterface interface,
- * generating a proxy if needed.
- */
-public static android.test.IExampleInterface asInterface(android.os.IBinder obj)
-{
-if ((obj==null)) {
-return null;
-}
-android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
-if (((iin!=null)&&(iin instanceof android.test.IExampleInterface))) {
-return ((android.test.IExampleInterface)iin);
-}
-return new android.test.IExampleInterface.Stub.Proxy(obj);
-}
-@Override public android.os.IBinder asBinder()
-{
-return this;
-}
-@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
-{
-java.lang.String descriptor = DESCRIPTOR;
-switch (code)
-{
-case INTERFACE_TRANSACTION:
-{
-reply.writeString(descriptor);
-return true;
-}
-case TRANSACTION_isEnabled:
-{
-data.enforceInterface(descriptor);
-boolean _result = this.isEnabled();
-reply.writeNoException();
-reply.writeInt(((_result)?(1):(0)));
-return true;
-}
-case TRANSACTION_getState:
-{
-data.enforceInterface(descriptor);
-int _result = this.getState();
-reply.writeNoException();
-reply.writeInt(_result);
-return true;
-}
-case TRANSACTION_getAddress:
-{
-data.enforceInterface(descriptor);
-java.lang.String _result = this.getAddress();
-reply.writeNoException();
-reply.writeString(_result);
-return true;
-}
-case TRANSACTION_getParcelables:
-{
-data.enforceInterface(descriptor);
-android.foo.ExampleParcelable[] _result = this.getParcelables();
-reply.writeNoException();
-reply.writeTypedArray(_result, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
-return true;
-}
-case TRANSACTION_setScanMode:
-{
-data.enforceInterface(descriptor);
-int _arg0;
-_arg0 = data.readInt();
-int _arg1;
-_arg1 = data.readInt();
-boolean _result = this.setScanMode(_arg0, _arg1);
-reply.writeNoException();
-reply.writeInt(((_result)?(1):(0)));
-return true;
-}
-case TRANSACTION_registerBinder:
-{
-data.enforceInterface(descriptor);
-android.bar.IAuxInterface _arg0;
-_arg0 = android.bar.IAuxInterface.Stub.asInterface(data.readStrongBinder());
-this.registerBinder(_arg0);
-reply.writeNoException();
-return true;
-}
-case TRANSACTION_getRecursiveBinder:
-{
-data.enforceInterface(descriptor);
-android.test.IExampleInterface _result = this.getRecursiveBinder();
-reply.writeNoException();
-reply.writeStrongBinder((((_result!=null))?(_result.asBinder()):(null)));
-return true;
-}
-case TRANSACTION_takesAnInterface:
-{
-data.enforceInterface(descriptor);
-android.test.IAuxInterface2 _arg0;
-_arg0 = android.test.IAuxInterface2.Stub.asInterface(data.readStrongBinder());
-int _result = this.takesAnInterface(_arg0);
-reply.writeNoException();
-reply.writeInt(_result);
-return true;
-}
-case TRANSACTION_takesAParcelable:
-{
-data.enforceInterface(descriptor);
-android.test.CompoundParcelable.Subclass1 _arg0;
-if ((0!=data.readInt())) {
-_arg0 = android.test.CompoundParcelable.Subclass1.CREATOR.createFromParcel(data);
-}
-else {
-_arg0 = null;
-}
-android.test.CompoundParcelable.Subclass2 _arg1;
-if ((0!=data.readInt())) {
-_arg1 = android.test.CompoundParcelable.Subclass2.CREATOR.createFromParcel(data);
-}
-else {
-_arg1 = null;
-}
-int _result = this.takesAParcelable(_arg0, _arg1);
-reply.writeNoException();
-reply.writeInt(_result);
-if ((_arg1!=null)) {
-reply.writeInt(1);
-_arg1.writeToParcel(reply, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
-}
-else {
-reply.writeInt(0);
-}
-return true;
-}
-default:
-{
-return super.onTransact(code, data, reply, flags);
-}
-}
-}
-private static class Proxy implements android.test.IExampleInterface
-{
-private android.os.IBinder mRemote;
-Proxy(android.os.IBinder remote)
-{
-mRemote = remote;
-}
-@Override public android.os.IBinder asBinder()
-{
-return mRemote;
-}
-public java.lang.String getInterfaceDescriptor()
-{
-return DESCRIPTOR;
-}
-@Override public boolean isEnabled() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-boolean _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_isEnabled, _data, _reply, 0);
-_reply.readException();
-_result = (0!=_reply.readInt());
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-@Override public int getState() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-int _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_getState, _data, _reply, 0);
-_reply.readException();
-_result = _reply.readInt();
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-@Override public java.lang.String getAddress() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-java.lang.String _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_getAddress, _data, _reply, 0);
-_reply.readException();
-_result = _reply.readString();
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-/* Test long comment */
-@Override public android.foo.ExampleParcelable[] getParcelables() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-android.foo.ExampleParcelable[] _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_getParcelables, _data, _reply, 0);
-_reply.readException();
-_result = _reply.createTypedArray(android.foo.ExampleParcelable.CREATOR);
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-// Test short comment
+  /** Local-side IPC implementation stub class. */
+  public static abstract class Stub extends android.os.Binder implements android.test.IExampleInterface
+  {
+    private static final java.lang.String DESCRIPTOR = "android.test.IExampleInterface";
+    /** Construct the stub at attach it to the interface. */
+    public Stub()
+    {
+      this.attachInterface(this, DESCRIPTOR);
+    }
+    /**
+     * Cast an IBinder object into an android.test.IExampleInterface interface,
+     * generating a proxy if needed.
+     */
+    public static android.test.IExampleInterface asInterface(android.os.IBinder obj)
+    {
+      if ((obj==null)) {
+        return null;
+      }
+      android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
+      if (((iin!=null)&&(iin instanceof android.test.IExampleInterface))) {
+        return ((android.test.IExampleInterface)iin);
+      }
+      return new android.test.IExampleInterface.Stub.Proxy(obj);
+    }
+    @Override public android.os.IBinder asBinder()
+    {
+      return this;
+    }
+    @Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
+    {
+      java.lang.String descriptor = DESCRIPTOR;
+      switch (code)
+      {
+        case INTERFACE_TRANSACTION:
+        {
+          reply.writeString(descriptor);
+          return true;
+        }
+        case TRANSACTION_isEnabled:
+        {
+          data.enforceInterface(descriptor);
+          boolean _result = this.isEnabled();
+          reply.writeNoException();
+          reply.writeInt(((_result)?(1):(0)));
+          return true;
+        }
+        case TRANSACTION_getState:
+        {
+          data.enforceInterface(descriptor);
+          int _result = this.getState();
+          reply.writeNoException();
+          reply.writeInt(_result);
+          return true;
+        }
+        case TRANSACTION_getAddress:
+        {
+          data.enforceInterface(descriptor);
+          java.lang.String _result = this.getAddress();
+          reply.writeNoException();
+          reply.writeString(_result);
+          return true;
+        }
+        case TRANSACTION_getParcelables:
+        {
+          data.enforceInterface(descriptor);
+          android.foo.ExampleParcelable[] _result = this.getParcelables();
+          reply.writeNoException();
+          reply.writeTypedArray(_result, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
+          return true;
+        }
+        case TRANSACTION_setScanMode:
+        {
+          data.enforceInterface(descriptor);
+          int _arg0;
+          _arg0 = data.readInt();
+          int _arg1;
+          _arg1 = data.readInt();
+          boolean _result = this.setScanMode(_arg0, _arg1);
+          reply.writeNoException();
+          reply.writeInt(((_result)?(1):(0)));
+          return true;
+        }
+        case TRANSACTION_registerBinder:
+        {
+          data.enforceInterface(descriptor);
+          android.bar.IAuxInterface _arg0;
+          _arg0 = android.bar.IAuxInterface.Stub.asInterface(data.readStrongBinder());
+          this.registerBinder(_arg0);
+          reply.writeNoException();
+          return true;
+        }
+        case TRANSACTION_getRecursiveBinder:
+        {
+          data.enforceInterface(descriptor);
+          android.test.IExampleInterface _result = this.getRecursiveBinder();
+          reply.writeNoException();
+          reply.writeStrongBinder((((_result!=null))?(_result.asBinder()):(null)));
+          return true;
+        }
+        case TRANSACTION_takesAnInterface:
+        {
+          data.enforceInterface(descriptor);
+          android.test.IAuxInterface2 _arg0;
+          _arg0 = android.test.IAuxInterface2.Stub.asInterface(data.readStrongBinder());
+          int _result = this.takesAnInterface(_arg0);
+          reply.writeNoException();
+          reply.writeInt(_result);
+          return true;
+        }
+        case TRANSACTION_takesAParcelable:
+        {
+          data.enforceInterface(descriptor);
+          android.test.CompoundParcelable.Subclass1 _arg0;
+          if ((0!=data.readInt())) {
+            _arg0 = android.test.CompoundParcelable.Subclass1.CREATOR.createFromParcel(data);
+          }
+          else {
+            _arg0 = null;
+          }
+          android.test.CompoundParcelable.Subclass2 _arg1;
+          if ((0!=data.readInt())) {
+            _arg1 = android.test.CompoundParcelable.Subclass2.CREATOR.createFromParcel(data);
+          }
+          else {
+            _arg1 = null;
+          }
+          int _result = this.takesAParcelable(_arg0, _arg1);
+          reply.writeNoException();
+          reply.writeInt(_result);
+          if ((_arg1!=null)) {
+            reply.writeInt(1);
+            _arg1.writeToParcel(reply, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
+          }
+          else {
+            reply.writeInt(0);
+          }
+          return true;
+        }
+        default:
+        {
+          return super.onTransact(code, data, reply, flags);
+        }
+      }
+    }
+    private static class Proxy implements android.test.IExampleInterface
+    {
+      private android.os.IBinder mRemote;
+      Proxy(android.os.IBinder remote)
+      {
+        mRemote = remote;
+      }
+      @Override public android.os.IBinder asBinder()
+      {
+        return mRemote;
+      }
+      public java.lang.String getInterfaceDescriptor()
+      {
+        return DESCRIPTOR;
+      }
+      @Override public boolean isEnabled() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        boolean _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_isEnabled, _data, _reply, 0);
+          _reply.readException();
+          _result = (0!=_reply.readInt());
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      @Override public int getState() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        int _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_getState, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.readInt();
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      @Override public java.lang.String getAddress() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        java.lang.String _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_getAddress, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.readString();
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      /* Test long comment */
+      @Override public android.foo.ExampleParcelable[] getParcelables() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        android.foo.ExampleParcelable[] _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_getParcelables, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.createTypedArray(android.foo.ExampleParcelable.CREATOR);
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      // Test short comment
 
-@Override public boolean setScanMode(int mode, int duration) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-boolean _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-_data.writeInt(mode);
-_data.writeInt(duration);
-mRemote.transact(Stub.TRANSACTION_setScanMode, _data, _reply, 0);
-_reply.readException();
-_result = (0!=_reply.readInt());
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-/* Test long comment */// And short comment
+      @Override public boolean setScanMode(int mode, int duration) throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        boolean _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          _data.writeInt(mode);
+          _data.writeInt(duration);
+          mRemote.transact(Stub.TRANSACTION_setScanMode, _data, _reply, 0);
+          _reply.readException();
+          _result = (0!=_reply.readInt());
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      /* Test long comment */// And short comment
 
-@Override public void registerBinder(android.bar.IAuxInterface foo) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-_data.writeStrongBinder((((foo!=null))?(foo.asBinder()):(null)));
-mRemote.transact(Stub.TRANSACTION_registerBinder, _data, _reply, 0);
-_reply.readException();
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-}
-@Override public android.test.IExampleInterface getRecursiveBinder() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-android.test.IExampleInterface _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_getRecursiveBinder, _data, _reply, 0);
-_reply.readException();
-_result = android.test.IExampleInterface.Stub.asInterface(_reply.readStrongBinder());
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-@Override public int takesAnInterface(android.test.IAuxInterface2 arg) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-int _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-_data.writeStrongBinder((((arg!=null))?(arg.asBinder()):(null)));
-mRemote.transact(Stub.TRANSACTION_takesAnInterface, _data, _reply, 0);
-_reply.readException();
-_result = _reply.readInt();
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-@Override public int takesAParcelable(android.test.CompoundParcelable.Subclass1 arg, android.test.CompoundParcelable.Subclass2 arg2) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-int _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-if ((arg!=null)) {
-_data.writeInt(1);
-arg.writeToParcel(_data, 0);
-}
-else {
-_data.writeInt(0);
-}
-if ((arg2!=null)) {
-_data.writeInt(1);
-arg2.writeToParcel(_data, 0);
-}
-else {
-_data.writeInt(0);
-}
-mRemote.transact(Stub.TRANSACTION_takesAParcelable, _data, _reply, 0);
-_reply.readException();
-_result = _reply.readInt();
-if ((0!=_reply.readInt())) {
-arg2.readFromParcel(_reply);
-}
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-}
-static final int TRANSACTION_isEnabled = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
-static final int TRANSACTION_getState = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
-static final int TRANSACTION_getAddress = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
-static final int TRANSACTION_getParcelables = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3);
-static final int TRANSACTION_setScanMode = (android.os.IBinder.FIRST_CALL_TRANSACTION + 4);
-static final int TRANSACTION_registerBinder = (android.os.IBinder.FIRST_CALL_TRANSACTION + 5);
-static final int TRANSACTION_getRecursiveBinder = (android.os.IBinder.FIRST_CALL_TRANSACTION + 6);
-static final int TRANSACTION_takesAnInterface = (android.os.IBinder.FIRST_CALL_TRANSACTION + 7);
-static final int TRANSACTION_takesAParcelable = (android.os.IBinder.FIRST_CALL_TRANSACTION + 8);
-}
-public static final int EXAMPLE_CONSTANT = 3;
-public boolean isEnabled() throws android.os.RemoteException;
-public int getState() throws android.os.RemoteException;
-public java.lang.String getAddress() throws android.os.RemoteException;
-/* Test long comment */
-public android.foo.ExampleParcelable[] getParcelables() throws android.os.RemoteException;
-// Test short comment
+      @Override public void registerBinder(android.bar.IAuxInterface foo) throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          _data.writeStrongBinder((((foo!=null))?(foo.asBinder()):(null)));
+          mRemote.transact(Stub.TRANSACTION_registerBinder, _data, _reply, 0);
+          _reply.readException();
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+      }
+      @Override public android.test.IExampleInterface getRecursiveBinder() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        android.test.IExampleInterface _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_getRecursiveBinder, _data, _reply, 0);
+          _reply.readException();
+          _result = android.test.IExampleInterface.Stub.asInterface(_reply.readStrongBinder());
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      @Override public int takesAnInterface(android.test.IAuxInterface2 arg) throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        int _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          _data.writeStrongBinder((((arg!=null))?(arg.asBinder()):(null)));
+          mRemote.transact(Stub.TRANSACTION_takesAnInterface, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.readInt();
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      @Override public int takesAParcelable(android.test.CompoundParcelable.Subclass1 arg, android.test.CompoundParcelable.Subclass2 arg2) throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        int _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          if ((arg!=null)) {
+            _data.writeInt(1);
+            arg.writeToParcel(_data, 0);
+          }
+          else {
+            _data.writeInt(0);
+          }
+          if ((arg2!=null)) {
+            _data.writeInt(1);
+            arg2.writeToParcel(_data, 0);
+          }
+          else {
+            _data.writeInt(0);
+          }
+          mRemote.transact(Stub.TRANSACTION_takesAParcelable, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.readInt();
+          if ((0!=_reply.readInt())) {
+            arg2.readFromParcel(_reply);
+          }
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+    }
+    static final int TRANSACTION_isEnabled = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
+    static final int TRANSACTION_getState = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
+    static final int TRANSACTION_getAddress = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
+    static final int TRANSACTION_getParcelables = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3);
+    static final int TRANSACTION_setScanMode = (android.os.IBinder.FIRST_CALL_TRANSACTION + 4);
+    static final int TRANSACTION_registerBinder = (android.os.IBinder.FIRST_CALL_TRANSACTION + 5);
+    static final int TRANSACTION_getRecursiveBinder = (android.os.IBinder.FIRST_CALL_TRANSACTION + 6);
+    static final int TRANSACTION_takesAnInterface = (android.os.IBinder.FIRST_CALL_TRANSACTION + 7);
+    static final int TRANSACTION_takesAParcelable = (android.os.IBinder.FIRST_CALL_TRANSACTION + 8);
+  }
+  public static final int EXAMPLE_CONSTANT = 3;
+  public boolean isEnabled() throws android.os.RemoteException;
+  public int getState() throws android.os.RemoteException;
+  public java.lang.String getAddress() throws android.os.RemoteException;
+  /* Test long comment */
+  public android.foo.ExampleParcelable[] getParcelables() throws android.os.RemoteException;
+  // Test short comment
 
-public boolean setScanMode(int mode, int duration) throws android.os.RemoteException;
-/* Test long comment */// And short comment
+  public boolean setScanMode(int mode, int duration) throws android.os.RemoteException;
+  /* Test long comment */// And short comment
 
-public void registerBinder(android.bar.IAuxInterface foo) throws android.os.RemoteException;
-public android.test.IExampleInterface getRecursiveBinder() throws android.os.RemoteException;
-public int takesAnInterface(android.test.IAuxInterface2 arg) throws android.os.RemoteException;
-public int takesAParcelable(android.test.CompoundParcelable.Subclass1 arg, android.test.CompoundParcelable.Subclass2 arg2) throws android.os.RemoteException;
+  public void registerBinder(android.bar.IAuxInterface foo) throws android.os.RemoteException;
+  public android.test.IExampleInterface getRecursiveBinder() throws android.os.RemoteException;
+  public int takesAnInterface(android.test.IAuxInterface2 arg) throws android.os.RemoteException;
+  public int takesAParcelable(android.test.CompoundParcelable.Subclass1 arg, android.test.CompoundParcelable.Subclass2 arg2) throws android.os.RemoteException;
 }
 )";
 
@@ -493,447 +493,447 @@
 package android.test;
 public interface IExampleInterface extends android.os.IInterface
 {
-/** Local-side IPC implementation stub class. */
-public static abstract class Stub extends android.os.Binder implements android.test.IExampleInterface
-{
-private static final java.lang.String DESCRIPTOR = "android.test.IExampleInterface";
-/** Construct the stub at attach it to the interface. */
-public Stub()
-{
-this.attachInterface(this, DESCRIPTOR);
-}
-/**
- * Cast an IBinder object into an android.test.IExampleInterface interface,
- * generating a proxy if needed.
- */
-public static android.test.IExampleInterface asInterface(android.os.IBinder obj)
-{
-if ((obj==null)) {
-return null;
-}
-android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
-if (((iin!=null)&&(iin instanceof android.test.IExampleInterface))) {
-return ((android.test.IExampleInterface)iin);
-}
-return new android.test.IExampleInterface.Stub.Proxy(obj);
-}
-@Override public android.os.IBinder asBinder()
-{
-return this;
-}
-@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
-{
-java.lang.String descriptor = DESCRIPTOR;
-switch (code)
-{
-case INTERFACE_TRANSACTION:
-{
-reply.writeString(descriptor);
-return true;
-}
-case TRANSACTION_isEnabled:
-{
-data.enforceInterface(descriptor);
-boolean _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::isEnabled::server");
-_result = this.isEnabled();
-}
-finally {
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-reply.writeNoException();
-reply.writeInt(((_result)?(1):(0)));
-return true;
-}
-case TRANSACTION_getState:
-{
-data.enforceInterface(descriptor);
-int _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getState::server");
-_result = this.getState();
-}
-finally {
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-reply.writeNoException();
-reply.writeInt(_result);
-return true;
-}
-case TRANSACTION_getAddress:
-{
-data.enforceInterface(descriptor);
-java.lang.String _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getAddress::server");
-_result = this.getAddress();
-}
-finally {
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-reply.writeNoException();
-reply.writeString(_result);
-return true;
-}
-case TRANSACTION_getParcelables:
-{
-data.enforceInterface(descriptor);
-android.foo.ExampleParcelable[] _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getParcelables::server");
-_result = this.getParcelables();
-}
-finally {
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-reply.writeNoException();
-reply.writeTypedArray(_result, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
-return true;
-}
-case TRANSACTION_setScanMode:
-{
-data.enforceInterface(descriptor);
-int _arg0;
-_arg0 = data.readInt();
-int _arg1;
-_arg1 = data.readInt();
-boolean _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::setScanMode::server");
-_result = this.setScanMode(_arg0, _arg1);
-}
-finally {
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-reply.writeNoException();
-reply.writeInt(((_result)?(1):(0)));
-return true;
-}
-case TRANSACTION_registerBinder:
-{
-data.enforceInterface(descriptor);
-android.bar.IAuxInterface _arg0;
-_arg0 = android.bar.IAuxInterface.Stub.asInterface(data.readStrongBinder());
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::registerBinder::server");
-this.registerBinder(_arg0);
-}
-finally {
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-reply.writeNoException();
-return true;
-}
-case TRANSACTION_getRecursiveBinder:
-{
-data.enforceInterface(descriptor);
-android.test.IExampleInterface _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getRecursiveBinder::server");
-_result = this.getRecursiveBinder();
-}
-finally {
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-reply.writeNoException();
-reply.writeStrongBinder((((_result!=null))?(_result.asBinder()):(null)));
-return true;
-}
-case TRANSACTION_takesAnInterface:
-{
-data.enforceInterface(descriptor);
-android.test.IAuxInterface2 _arg0;
-_arg0 = android.test.IAuxInterface2.Stub.asInterface(data.readStrongBinder());
-int _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::takesAnInterface::server");
-_result = this.takesAnInterface(_arg0);
-}
-finally {
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-reply.writeNoException();
-reply.writeInt(_result);
-return true;
-}
-case TRANSACTION_takesAParcelable:
-{
-data.enforceInterface(descriptor);
-android.test.CompoundParcelable.Subclass1 _arg0;
-if ((0!=data.readInt())) {
-_arg0 = android.test.CompoundParcelable.Subclass1.CREATOR.createFromParcel(data);
-}
-else {
-_arg0 = null;
-}
-android.test.CompoundParcelable.Subclass2 _arg1;
-if ((0!=data.readInt())) {
-_arg1 = android.test.CompoundParcelable.Subclass2.CREATOR.createFromParcel(data);
-}
-else {
-_arg1 = null;
-}
-int _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::takesAParcelable::server");
-_result = this.takesAParcelable(_arg0, _arg1);
-}
-finally {
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-reply.writeNoException();
-reply.writeInt(_result);
-if ((_arg1!=null)) {
-reply.writeInt(1);
-_arg1.writeToParcel(reply, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
-}
-else {
-reply.writeInt(0);
-}
-return true;
-}
-default:
-{
-return super.onTransact(code, data, reply, flags);
-}
-}
-}
-private static class Proxy implements android.test.IExampleInterface
-{
-private android.os.IBinder mRemote;
-Proxy(android.os.IBinder remote)
-{
-mRemote = remote;
-}
-@Override public android.os.IBinder asBinder()
-{
-return mRemote;
-}
-public java.lang.String getInterfaceDescriptor()
-{
-return DESCRIPTOR;
-}
-@Override public boolean isEnabled() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-boolean _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::isEnabled::client");
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_isEnabled, _data, _reply, 0);
-_reply.readException();
-_result = (0!=_reply.readInt());
-}
-finally {
-_reply.recycle();
-_data.recycle();
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-return _result;
-}
-@Override public int getState() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-int _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getState::client");
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_getState, _data, _reply, 0);
-_reply.readException();
-_result = _reply.readInt();
-}
-finally {
-_reply.recycle();
-_data.recycle();
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-return _result;
-}
-@Override public java.lang.String getAddress() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-java.lang.String _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getAddress::client");
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_getAddress, _data, _reply, 0);
-_reply.readException();
-_result = _reply.readString();
-}
-finally {
-_reply.recycle();
-_data.recycle();
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-return _result;
-}
-/* Test long comment */
-@Override public android.foo.ExampleParcelable[] getParcelables() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-android.foo.ExampleParcelable[] _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getParcelables::client");
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_getParcelables, _data, _reply, 0);
-_reply.readException();
-_result = _reply.createTypedArray(android.foo.ExampleParcelable.CREATOR);
-}
-finally {
-_reply.recycle();
-_data.recycle();
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-return _result;
-}
-// Test short comment
+  /** Local-side IPC implementation stub class. */
+  public static abstract class Stub extends android.os.Binder implements android.test.IExampleInterface
+  {
+    private static final java.lang.String DESCRIPTOR = "android.test.IExampleInterface";
+    /** Construct the stub at attach it to the interface. */
+    public Stub()
+    {
+      this.attachInterface(this, DESCRIPTOR);
+    }
+    /**
+     * Cast an IBinder object into an android.test.IExampleInterface interface,
+     * generating a proxy if needed.
+     */
+    public static android.test.IExampleInterface asInterface(android.os.IBinder obj)
+    {
+      if ((obj==null)) {
+        return null;
+      }
+      android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
+      if (((iin!=null)&&(iin instanceof android.test.IExampleInterface))) {
+        return ((android.test.IExampleInterface)iin);
+      }
+      return new android.test.IExampleInterface.Stub.Proxy(obj);
+    }
+    @Override public android.os.IBinder asBinder()
+    {
+      return this;
+    }
+    @Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
+    {
+      java.lang.String descriptor = DESCRIPTOR;
+      switch (code)
+      {
+        case INTERFACE_TRANSACTION:
+        {
+          reply.writeString(descriptor);
+          return true;
+        }
+        case TRANSACTION_isEnabled:
+        {
+          data.enforceInterface(descriptor);
+          boolean _result;
+          try {
+            android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::isEnabled::server");
+            _result = this.isEnabled();
+          }
+          finally {
+            android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+          }
+          reply.writeNoException();
+          reply.writeInt(((_result)?(1):(0)));
+          return true;
+        }
+        case TRANSACTION_getState:
+        {
+          data.enforceInterface(descriptor);
+          int _result;
+          try {
+            android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getState::server");
+            _result = this.getState();
+          }
+          finally {
+            android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+          }
+          reply.writeNoException();
+          reply.writeInt(_result);
+          return true;
+        }
+        case TRANSACTION_getAddress:
+        {
+          data.enforceInterface(descriptor);
+          java.lang.String _result;
+          try {
+            android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getAddress::server");
+            _result = this.getAddress();
+          }
+          finally {
+            android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+          }
+          reply.writeNoException();
+          reply.writeString(_result);
+          return true;
+        }
+        case TRANSACTION_getParcelables:
+        {
+          data.enforceInterface(descriptor);
+          android.foo.ExampleParcelable[] _result;
+          try {
+            android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getParcelables::server");
+            _result = this.getParcelables();
+          }
+          finally {
+            android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+          }
+          reply.writeNoException();
+          reply.writeTypedArray(_result, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
+          return true;
+        }
+        case TRANSACTION_setScanMode:
+        {
+          data.enforceInterface(descriptor);
+          int _arg0;
+          _arg0 = data.readInt();
+          int _arg1;
+          _arg1 = data.readInt();
+          boolean _result;
+          try {
+            android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::setScanMode::server");
+            _result = this.setScanMode(_arg0, _arg1);
+          }
+          finally {
+            android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+          }
+          reply.writeNoException();
+          reply.writeInt(((_result)?(1):(0)));
+          return true;
+        }
+        case TRANSACTION_registerBinder:
+        {
+          data.enforceInterface(descriptor);
+          android.bar.IAuxInterface _arg0;
+          _arg0 = android.bar.IAuxInterface.Stub.asInterface(data.readStrongBinder());
+          try {
+            android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::registerBinder::server");
+            this.registerBinder(_arg0);
+          }
+          finally {
+            android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+          }
+          reply.writeNoException();
+          return true;
+        }
+        case TRANSACTION_getRecursiveBinder:
+        {
+          data.enforceInterface(descriptor);
+          android.test.IExampleInterface _result;
+          try {
+            android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getRecursiveBinder::server");
+            _result = this.getRecursiveBinder();
+          }
+          finally {
+            android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+          }
+          reply.writeNoException();
+          reply.writeStrongBinder((((_result!=null))?(_result.asBinder()):(null)));
+          return true;
+        }
+        case TRANSACTION_takesAnInterface:
+        {
+          data.enforceInterface(descriptor);
+          android.test.IAuxInterface2 _arg0;
+          _arg0 = android.test.IAuxInterface2.Stub.asInterface(data.readStrongBinder());
+          int _result;
+          try {
+            android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::takesAnInterface::server");
+            _result = this.takesAnInterface(_arg0);
+          }
+          finally {
+            android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+          }
+          reply.writeNoException();
+          reply.writeInt(_result);
+          return true;
+        }
+        case TRANSACTION_takesAParcelable:
+        {
+          data.enforceInterface(descriptor);
+          android.test.CompoundParcelable.Subclass1 _arg0;
+          if ((0!=data.readInt())) {
+            _arg0 = android.test.CompoundParcelable.Subclass1.CREATOR.createFromParcel(data);
+          }
+          else {
+            _arg0 = null;
+          }
+          android.test.CompoundParcelable.Subclass2 _arg1;
+          if ((0!=data.readInt())) {
+            _arg1 = android.test.CompoundParcelable.Subclass2.CREATOR.createFromParcel(data);
+          }
+          else {
+            _arg1 = null;
+          }
+          int _result;
+          try {
+            android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::takesAParcelable::server");
+            _result = this.takesAParcelable(_arg0, _arg1);
+          }
+          finally {
+            android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+          }
+          reply.writeNoException();
+          reply.writeInt(_result);
+          if ((_arg1!=null)) {
+            reply.writeInt(1);
+            _arg1.writeToParcel(reply, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
+          }
+          else {
+            reply.writeInt(0);
+          }
+          return true;
+        }
+        default:
+        {
+          return super.onTransact(code, data, reply, flags);
+        }
+      }
+    }
+    private static class Proxy implements android.test.IExampleInterface
+    {
+      private android.os.IBinder mRemote;
+      Proxy(android.os.IBinder remote)
+      {
+        mRemote = remote;
+      }
+      @Override public android.os.IBinder asBinder()
+      {
+        return mRemote;
+      }
+      public java.lang.String getInterfaceDescriptor()
+      {
+        return DESCRIPTOR;
+      }
+      @Override public boolean isEnabled() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        boolean _result;
+        try {
+          android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::isEnabled::client");
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_isEnabled, _data, _reply, 0);
+          _reply.readException();
+          _result = (0!=_reply.readInt());
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+          android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+        }
+        return _result;
+      }
+      @Override public int getState() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        int _result;
+        try {
+          android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getState::client");
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_getState, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.readInt();
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+          android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+        }
+        return _result;
+      }
+      @Override public java.lang.String getAddress() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        java.lang.String _result;
+        try {
+          android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getAddress::client");
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_getAddress, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.readString();
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+          android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+        }
+        return _result;
+      }
+      /* Test long comment */
+      @Override public android.foo.ExampleParcelable[] getParcelables() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        android.foo.ExampleParcelable[] _result;
+        try {
+          android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getParcelables::client");
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_getParcelables, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.createTypedArray(android.foo.ExampleParcelable.CREATOR);
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+          android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+        }
+        return _result;
+      }
+      // Test short comment
 
-@Override public boolean setScanMode(int mode, int duration) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-boolean _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::setScanMode::client");
-_data.writeInterfaceToken(DESCRIPTOR);
-_data.writeInt(mode);
-_data.writeInt(duration);
-mRemote.transact(Stub.TRANSACTION_setScanMode, _data, _reply, 0);
-_reply.readException();
-_result = (0!=_reply.readInt());
-}
-finally {
-_reply.recycle();
-_data.recycle();
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-return _result;
-}
-/* Test long comment */// And short comment
+      @Override public boolean setScanMode(int mode, int duration) throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        boolean _result;
+        try {
+          android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::setScanMode::client");
+          _data.writeInterfaceToken(DESCRIPTOR);
+          _data.writeInt(mode);
+          _data.writeInt(duration);
+          mRemote.transact(Stub.TRANSACTION_setScanMode, _data, _reply, 0);
+          _reply.readException();
+          _result = (0!=_reply.readInt());
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+          android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+        }
+        return _result;
+      }
+      /* Test long comment */// And short comment
 
-@Override public void registerBinder(android.bar.IAuxInterface foo) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::registerBinder::client");
-_data.writeInterfaceToken(DESCRIPTOR);
-_data.writeStrongBinder((((foo!=null))?(foo.asBinder()):(null)));
-mRemote.transact(Stub.TRANSACTION_registerBinder, _data, _reply, 0);
-_reply.readException();
-}
-finally {
-_reply.recycle();
-_data.recycle();
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-}
-@Override public android.test.IExampleInterface getRecursiveBinder() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-android.test.IExampleInterface _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getRecursiveBinder::client");
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_getRecursiveBinder, _data, _reply, 0);
-_reply.readException();
-_result = android.test.IExampleInterface.Stub.asInterface(_reply.readStrongBinder());
-}
-finally {
-_reply.recycle();
-_data.recycle();
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-return _result;
-}
-@Override public int takesAnInterface(android.test.IAuxInterface2 arg) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-int _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::takesAnInterface::client");
-_data.writeInterfaceToken(DESCRIPTOR);
-_data.writeStrongBinder((((arg!=null))?(arg.asBinder()):(null)));
-mRemote.transact(Stub.TRANSACTION_takesAnInterface, _data, _reply, 0);
-_reply.readException();
-_result = _reply.readInt();
-}
-finally {
-_reply.recycle();
-_data.recycle();
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-return _result;
-}
-@Override public int takesAParcelable(android.test.CompoundParcelable.Subclass1 arg, android.test.CompoundParcelable.Subclass2 arg2) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-int _result;
-try {
-android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::takesAParcelable::client");
-_data.writeInterfaceToken(DESCRIPTOR);
-if ((arg!=null)) {
-_data.writeInt(1);
-arg.writeToParcel(_data, 0);
-}
-else {
-_data.writeInt(0);
-}
-if ((arg2!=null)) {
-_data.writeInt(1);
-arg2.writeToParcel(_data, 0);
-}
-else {
-_data.writeInt(0);
-}
-mRemote.transact(Stub.TRANSACTION_takesAParcelable, _data, _reply, 0);
-_reply.readException();
-_result = _reply.readInt();
-if ((0!=_reply.readInt())) {
-arg2.readFromParcel(_reply);
-}
-}
-finally {
-_reply.recycle();
-_data.recycle();
-android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
-}
-return _result;
-}
-}
-static final int TRANSACTION_isEnabled = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
-static final int TRANSACTION_getState = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
-static final int TRANSACTION_getAddress = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
-static final int TRANSACTION_getParcelables = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3);
-static final int TRANSACTION_setScanMode = (android.os.IBinder.FIRST_CALL_TRANSACTION + 4);
-static final int TRANSACTION_registerBinder = (android.os.IBinder.FIRST_CALL_TRANSACTION + 5);
-static final int TRANSACTION_getRecursiveBinder = (android.os.IBinder.FIRST_CALL_TRANSACTION + 6);
-static final int TRANSACTION_takesAnInterface = (android.os.IBinder.FIRST_CALL_TRANSACTION + 7);
-static final int TRANSACTION_takesAParcelable = (android.os.IBinder.FIRST_CALL_TRANSACTION + 8);
-}
-public static final int EXAMPLE_CONSTANT = 3;
-public boolean isEnabled() throws android.os.RemoteException;
-public int getState() throws android.os.RemoteException;
-public java.lang.String getAddress() throws android.os.RemoteException;
-/* Test long comment */
-public android.foo.ExampleParcelable[] getParcelables() throws android.os.RemoteException;
-// Test short comment
+      @Override public void registerBinder(android.bar.IAuxInterface foo) throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        try {
+          android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::registerBinder::client");
+          _data.writeInterfaceToken(DESCRIPTOR);
+          _data.writeStrongBinder((((foo!=null))?(foo.asBinder()):(null)));
+          mRemote.transact(Stub.TRANSACTION_registerBinder, _data, _reply, 0);
+          _reply.readException();
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+          android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+        }
+      }
+      @Override public android.test.IExampleInterface getRecursiveBinder() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        android.test.IExampleInterface _result;
+        try {
+          android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::getRecursiveBinder::client");
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_getRecursiveBinder, _data, _reply, 0);
+          _reply.readException();
+          _result = android.test.IExampleInterface.Stub.asInterface(_reply.readStrongBinder());
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+          android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+        }
+        return _result;
+      }
+      @Override public int takesAnInterface(android.test.IAuxInterface2 arg) throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        int _result;
+        try {
+          android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::takesAnInterface::client");
+          _data.writeInterfaceToken(DESCRIPTOR);
+          _data.writeStrongBinder((((arg!=null))?(arg.asBinder()):(null)));
+          mRemote.transact(Stub.TRANSACTION_takesAnInterface, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.readInt();
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+          android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+        }
+        return _result;
+      }
+      @Override public int takesAParcelable(android.test.CompoundParcelable.Subclass1 arg, android.test.CompoundParcelable.Subclass2 arg2) throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        int _result;
+        try {
+          android.os.Trace.traceBegin(android.os.Trace.TRACE_TAG_AIDL, "IExampleInterface::takesAParcelable::client");
+          _data.writeInterfaceToken(DESCRIPTOR);
+          if ((arg!=null)) {
+            _data.writeInt(1);
+            arg.writeToParcel(_data, 0);
+          }
+          else {
+            _data.writeInt(0);
+          }
+          if ((arg2!=null)) {
+            _data.writeInt(1);
+            arg2.writeToParcel(_data, 0);
+          }
+          else {
+            _data.writeInt(0);
+          }
+          mRemote.transact(Stub.TRANSACTION_takesAParcelable, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.readInt();
+          if ((0!=_reply.readInt())) {
+            arg2.readFromParcel(_reply);
+          }
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+          android.os.Trace.traceEnd(android.os.Trace.TRACE_TAG_AIDL);
+        }
+        return _result;
+      }
+    }
+    static final int TRANSACTION_isEnabled = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
+    static final int TRANSACTION_getState = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
+    static final int TRANSACTION_getAddress = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
+    static final int TRANSACTION_getParcelables = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3);
+    static final int TRANSACTION_setScanMode = (android.os.IBinder.FIRST_CALL_TRANSACTION + 4);
+    static final int TRANSACTION_registerBinder = (android.os.IBinder.FIRST_CALL_TRANSACTION + 5);
+    static final int TRANSACTION_getRecursiveBinder = (android.os.IBinder.FIRST_CALL_TRANSACTION + 6);
+    static final int TRANSACTION_takesAnInterface = (android.os.IBinder.FIRST_CALL_TRANSACTION + 7);
+    static final int TRANSACTION_takesAParcelable = (android.os.IBinder.FIRST_CALL_TRANSACTION + 8);
+  }
+  public static final int EXAMPLE_CONSTANT = 3;
+  public boolean isEnabled() throws android.os.RemoteException;
+  public int getState() throws android.os.RemoteException;
+  public java.lang.String getAddress() throws android.os.RemoteException;
+  /* Test long comment */
+  public android.foo.ExampleParcelable[] getParcelables() throws android.os.RemoteException;
+  // Test short comment
 
-public boolean setScanMode(int mode, int duration) throws android.os.RemoteException;
-/* Test long comment */// And short comment
+  public boolean setScanMode(int mode, int duration) throws android.os.RemoteException;
+  /* Test long comment */// And short comment
 
-public void registerBinder(android.bar.IAuxInterface foo) throws android.os.RemoteException;
-public android.test.IExampleInterface getRecursiveBinder() throws android.os.RemoteException;
-public int takesAnInterface(android.test.IAuxInterface2 arg) throws android.os.RemoteException;
-public int takesAParcelable(android.test.CompoundParcelable.Subclass1 arg, android.test.CompoundParcelable.Subclass2 arg2) throws android.os.RemoteException;
+  public void registerBinder(android.bar.IAuxInterface foo) throws android.os.RemoteException;
+  public android.test.IExampleInterface getRecursiveBinder() throws android.os.RemoteException;
+  public int takesAnInterface(android.test.IAuxInterface2 arg) throws android.os.RemoteException;
+  public int takesAParcelable(android.test.CompoundParcelable.Subclass1 arg, android.test.CompoundParcelable.Subclass2 arg2) throws android.os.RemoteException;
 }
 )";
 
@@ -945,397 +945,397 @@
 package android.test;
 public interface IExampleInterface extends android.os.IInterface
 {
-/** Local-side IPC implementation stub class. */
-public static abstract class Stub extends android.os.Binder implements android.test.IExampleInterface
-{
-private static final java.lang.String DESCRIPTOR = "android.test.IExampleInterface";
-/** Construct the stub at attach it to the interface. */
-public Stub()
-{
-this.attachInterface(this, DESCRIPTOR);
-}
-/**
- * Cast an IBinder object into an android.test.IExampleInterface interface,
- * generating a proxy if needed.
- */
-public static android.test.IExampleInterface asInterface(android.os.IBinder obj)
-{
-if ((obj==null)) {
-return null;
-}
-android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
-if (((iin!=null)&&(iin instanceof android.test.IExampleInterface))) {
-return ((android.test.IExampleInterface)iin);
-}
-return new android.test.IExampleInterface.Stub.Proxy(obj);
-}
-@Override public android.os.IBinder asBinder()
-{
-return this;
-}
-@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
-{
-java.lang.String descriptor = DESCRIPTOR;
-switch (code)
-{
-case INTERFACE_TRANSACTION:
-{
-reply.writeString(descriptor);
-return true;
-}
-case TRANSACTION_isEnabled:
-{
-data.enforceInterface(descriptor);
-boolean _result = this.isEnabled();
-reply.writeNoException();
-reply.writeInt(((_result)?(1):(0)));
-return true;
-}
-case TRANSACTION_getState:
-{
-return this.onTransact$getState$(data, reply);
-}
-case TRANSACTION_getAddress:
-{
-data.enforceInterface(descriptor);
-java.lang.String _result = this.getAddress();
-reply.writeNoException();
-reply.writeString(_result);
-return true;
-}
-case TRANSACTION_getParcelables:
-{
-data.enforceInterface(descriptor);
-android.foo.ExampleParcelable[] _result = this.getParcelables();
-reply.writeNoException();
-reply.writeTypedArray(_result, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
-return true;
-}
-case TRANSACTION_setScanMode:
-{
-return this.onTransact$setScanMode$(data, reply);
-}
-case TRANSACTION_registerBinder:
-{
-return this.onTransact$registerBinder$(data, reply);
-}
-case TRANSACTION_getRecursiveBinder:
-{
-return this.onTransact$getRecursiveBinder$(data, reply);
-}
-case TRANSACTION_takesAnInterface:
-{
-return this.onTransact$takesAnInterface$(data, reply);
-}
-case TRANSACTION_takesAParcelable:
-{
-return this.onTransact$takesAParcelable$(data, reply);
-}
-default:
-{
-return super.onTransact(code, data, reply, flags);
-}
-}
-}
-private static class Proxy implements android.test.IExampleInterface
-{
-private android.os.IBinder mRemote;
-Proxy(android.os.IBinder remote)
-{
-mRemote = remote;
-}
-@Override public android.os.IBinder asBinder()
-{
-return mRemote;
-}
-public java.lang.String getInterfaceDescriptor()
-{
-return DESCRIPTOR;
-}
-@Override public boolean isEnabled() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-boolean _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_isEnabled, _data, _reply, 0);
-_reply.readException();
-_result = (0!=_reply.readInt());
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-@Override public int getState(int a, int b) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-int _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-_data.writeInt(a);
-_data.writeInt(b);
-mRemote.transact(Stub.TRANSACTION_getState, _data, _reply, 0);
-_reply.readException();
-_result = _reply.readInt();
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-@Override public java.lang.String getAddress() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-java.lang.String _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_getAddress, _data, _reply, 0);
-_reply.readException();
-_result = _reply.readString();
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-/* Test long comment */
-@Override public android.foo.ExampleParcelable[] getParcelables() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-android.foo.ExampleParcelable[] _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_getParcelables, _data, _reply, 0);
-_reply.readException();
-_result = _reply.createTypedArray(android.foo.ExampleParcelable.CREATOR);
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-// Test short comment
+  /** Local-side IPC implementation stub class. */
+  public static abstract class Stub extends android.os.Binder implements android.test.IExampleInterface
+  {
+    private static final java.lang.String DESCRIPTOR = "android.test.IExampleInterface";
+    /** Construct the stub at attach it to the interface. */
+    public Stub()
+    {
+      this.attachInterface(this, DESCRIPTOR);
+    }
+    /**
+     * Cast an IBinder object into an android.test.IExampleInterface interface,
+     * generating a proxy if needed.
+     */
+    public static android.test.IExampleInterface asInterface(android.os.IBinder obj)
+    {
+      if ((obj==null)) {
+        return null;
+      }
+      android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
+      if (((iin!=null)&&(iin instanceof android.test.IExampleInterface))) {
+        return ((android.test.IExampleInterface)iin);
+      }
+      return new android.test.IExampleInterface.Stub.Proxy(obj);
+    }
+    @Override public android.os.IBinder asBinder()
+    {
+      return this;
+    }
+    @Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
+    {
+      java.lang.String descriptor = DESCRIPTOR;
+      switch (code)
+      {
+        case INTERFACE_TRANSACTION:
+        {
+          reply.writeString(descriptor);
+          return true;
+        }
+        case TRANSACTION_isEnabled:
+        {
+          data.enforceInterface(descriptor);
+          boolean _result = this.isEnabled();
+          reply.writeNoException();
+          reply.writeInt(((_result)?(1):(0)));
+          return true;
+        }
+        case TRANSACTION_getState:
+        {
+          return this.onTransact$getState$(data, reply);
+        }
+        case TRANSACTION_getAddress:
+        {
+          data.enforceInterface(descriptor);
+          java.lang.String _result = this.getAddress();
+          reply.writeNoException();
+          reply.writeString(_result);
+          return true;
+        }
+        case TRANSACTION_getParcelables:
+        {
+          data.enforceInterface(descriptor);
+          android.foo.ExampleParcelable[] _result = this.getParcelables();
+          reply.writeNoException();
+          reply.writeTypedArray(_result, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
+          return true;
+        }
+        case TRANSACTION_setScanMode:
+        {
+          return this.onTransact$setScanMode$(data, reply);
+        }
+        case TRANSACTION_registerBinder:
+        {
+          return this.onTransact$registerBinder$(data, reply);
+        }
+        case TRANSACTION_getRecursiveBinder:
+        {
+          return this.onTransact$getRecursiveBinder$(data, reply);
+        }
+        case TRANSACTION_takesAnInterface:
+        {
+          return this.onTransact$takesAnInterface$(data, reply);
+        }
+        case TRANSACTION_takesAParcelable:
+        {
+          return this.onTransact$takesAParcelable$(data, reply);
+        }
+        default:
+        {
+          return super.onTransact(code, data, reply, flags);
+        }
+      }
+    }
+    private static class Proxy implements android.test.IExampleInterface
+    {
+      private android.os.IBinder mRemote;
+      Proxy(android.os.IBinder remote)
+      {
+        mRemote = remote;
+      }
+      @Override public android.os.IBinder asBinder()
+      {
+        return mRemote;
+      }
+      public java.lang.String getInterfaceDescriptor()
+      {
+        return DESCRIPTOR;
+      }
+      @Override public boolean isEnabled() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        boolean _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_isEnabled, _data, _reply, 0);
+          _reply.readException();
+          _result = (0!=_reply.readInt());
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      @Override public int getState(int a, int b) throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        int _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          _data.writeInt(a);
+          _data.writeInt(b);
+          mRemote.transact(Stub.TRANSACTION_getState, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.readInt();
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      @Override public java.lang.String getAddress() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        java.lang.String _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_getAddress, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.readString();
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      /* Test long comment */
+      @Override public android.foo.ExampleParcelable[] getParcelables() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        android.foo.ExampleParcelable[] _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_getParcelables, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.createTypedArray(android.foo.ExampleParcelable.CREATOR);
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      // Test short comment
 
-@Override public boolean setScanMode(int mode, int duration) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-boolean _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-_data.writeInt(mode);
-_data.writeInt(duration);
-mRemote.transact(Stub.TRANSACTION_setScanMode, _data, _reply, 0);
-_reply.readException();
-_result = (0!=_reply.readInt());
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-/* Test long comment */// And short comment
+      @Override public boolean setScanMode(int mode, int duration) throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        boolean _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          _data.writeInt(mode);
+          _data.writeInt(duration);
+          mRemote.transact(Stub.TRANSACTION_setScanMode, _data, _reply, 0);
+          _reply.readException();
+          _result = (0!=_reply.readInt());
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      /* Test long comment */// And short comment
 
-@Override public void registerBinder(android.bar.IAuxInterface foo) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-_data.writeStrongBinder((((foo!=null))?(foo.asBinder()):(null)));
-mRemote.transact(Stub.TRANSACTION_registerBinder, _data, _reply, 0);
-_reply.readException();
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-}
-@Override public android.test.IExampleInterface getRecursiveBinder() throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-android.test.IExampleInterface _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-mRemote.transact(Stub.TRANSACTION_getRecursiveBinder, _data, _reply, 0);
-_reply.readException();
-_result = android.test.IExampleInterface.Stub.asInterface(_reply.readStrongBinder());
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-@Override public int takesAnInterface(android.test.IAuxInterface2 arg) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-int _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-_data.writeStrongBinder((((arg!=null))?(arg.asBinder()):(null)));
-mRemote.transact(Stub.TRANSACTION_takesAnInterface, _data, _reply, 0);
-_reply.readException();
-_result = _reply.readInt();
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-@Override public int takesAParcelable(android.test.CompoundParcelable.Subclass1 arg, android.test.CompoundParcelable.Subclass2 arg2) throws android.os.RemoteException
-{
-android.os.Parcel _data = android.os.Parcel.obtain();
-android.os.Parcel _reply = android.os.Parcel.obtain();
-int _result;
-try {
-_data.writeInterfaceToken(DESCRIPTOR);
-if ((arg!=null)) {
-_data.writeInt(1);
-arg.writeToParcel(_data, 0);
-}
-else {
-_data.writeInt(0);
-}
-if ((arg2!=null)) {
-_data.writeInt(1);
-arg2.writeToParcel(_data, 0);
-}
-else {
-_data.writeInt(0);
-}
-mRemote.transact(Stub.TRANSACTION_takesAParcelable, _data, _reply, 0);
-_reply.readException();
-_result = _reply.readInt();
-if ((0!=_reply.readInt())) {
-arg2.readFromParcel(_reply);
-}
-}
-finally {
-_reply.recycle();
-_data.recycle();
-}
-return _result;
-}
-}
-static final int TRANSACTION_isEnabled = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
-static final int TRANSACTION_getState = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
-private boolean onTransact$getState$(android.os.Parcel data, android.os.Parcel reply) throws android.os.RemoteException
-{
-data.enforceInterface(DESCRIPTOR);
-int _arg0;
-_arg0 = data.readInt();
-int _arg1;
-_arg1 = data.readInt();
-int _result = this.getState(_arg0, _arg1);
-reply.writeNoException();
-reply.writeInt(_result);
-return true;
-}
-static final int TRANSACTION_getAddress = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
-static final int TRANSACTION_getParcelables = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3);
-static final int TRANSACTION_setScanMode = (android.os.IBinder.FIRST_CALL_TRANSACTION + 4);
-private boolean onTransact$setScanMode$(android.os.Parcel data, android.os.Parcel reply) throws android.os.RemoteException
-{
-data.enforceInterface(DESCRIPTOR);
-int _arg0;
-_arg0 = data.readInt();
-int _arg1;
-_arg1 = data.readInt();
-boolean _result = this.setScanMode(_arg0, _arg1);
-reply.writeNoException();
-reply.writeInt(((_result)?(1):(0)));
-return true;
-}
-static final int TRANSACTION_registerBinder = (android.os.IBinder.FIRST_CALL_TRANSACTION + 5);
-private boolean onTransact$registerBinder$(android.os.Parcel data, android.os.Parcel reply) throws android.os.RemoteException
-{
-data.enforceInterface(DESCRIPTOR);
-android.bar.IAuxInterface _arg0;
-_arg0 = android.bar.IAuxInterface.Stub.asInterface(data.readStrongBinder());
-this.registerBinder(_arg0);
-reply.writeNoException();
-return true;
-}
-static final int TRANSACTION_getRecursiveBinder = (android.os.IBinder.FIRST_CALL_TRANSACTION + 6);
-private boolean onTransact$getRecursiveBinder$(android.os.Parcel data, android.os.Parcel reply) throws android.os.RemoteException
-{
-data.enforceInterface(DESCRIPTOR);
-android.test.IExampleInterface _result = this.getRecursiveBinder();
-reply.writeNoException();
-reply.writeStrongBinder((((_result!=null))?(_result.asBinder()):(null)));
-return true;
-}
-static final int TRANSACTION_takesAnInterface = (android.os.IBinder.FIRST_CALL_TRANSACTION + 7);
-private boolean onTransact$takesAnInterface$(android.os.Parcel data, android.os.Parcel reply) throws android.os.RemoteException
-{
-data.enforceInterface(DESCRIPTOR);
-android.test.IAuxInterface2 _arg0;
-_arg0 = android.test.IAuxInterface2.Stub.asInterface(data.readStrongBinder());
-int _result = this.takesAnInterface(_arg0);
-reply.writeNoException();
-reply.writeInt(_result);
-return true;
-}
-static final int TRANSACTION_takesAParcelable = (android.os.IBinder.FIRST_CALL_TRANSACTION + 8);
-private boolean onTransact$takesAParcelable$(android.os.Parcel data, android.os.Parcel reply) throws android.os.RemoteException
-{
-data.enforceInterface(DESCRIPTOR);
-android.test.CompoundParcelable.Subclass1 _arg0;
-if ((0!=data.readInt())) {
-_arg0 = android.test.CompoundParcelable.Subclass1.CREATOR.createFromParcel(data);
-}
-else {
-_arg0 = null;
-}
-android.test.CompoundParcelable.Subclass2 _arg1;
-if ((0!=data.readInt())) {
-_arg1 = android.test.CompoundParcelable.Subclass2.CREATOR.createFromParcel(data);
-}
-else {
-_arg1 = null;
-}
-int _result = this.takesAParcelable(_arg0, _arg1);
-reply.writeNoException();
-reply.writeInt(_result);
-if ((_arg1!=null)) {
-reply.writeInt(1);
-_arg1.writeToParcel(reply, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
-}
-else {
-reply.writeInt(0);
-}
-return true;
-}
-}
-public static final int EXAMPLE_CONSTANT = 3;
-public boolean isEnabled() throws android.os.RemoteException;
-public int getState(int a, int b) throws android.os.RemoteException;
-public java.lang.String getAddress() throws android.os.RemoteException;
-/* Test long comment */
-public android.foo.ExampleParcelable[] getParcelables() throws android.os.RemoteException;
-// Test short comment
+      @Override public void registerBinder(android.bar.IAuxInterface foo) throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          _data.writeStrongBinder((((foo!=null))?(foo.asBinder()):(null)));
+          mRemote.transact(Stub.TRANSACTION_registerBinder, _data, _reply, 0);
+          _reply.readException();
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+      }
+      @Override public android.test.IExampleInterface getRecursiveBinder() throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        android.test.IExampleInterface _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          mRemote.transact(Stub.TRANSACTION_getRecursiveBinder, _data, _reply, 0);
+          _reply.readException();
+          _result = android.test.IExampleInterface.Stub.asInterface(_reply.readStrongBinder());
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      @Override public int takesAnInterface(android.test.IAuxInterface2 arg) throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        int _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          _data.writeStrongBinder((((arg!=null))?(arg.asBinder()):(null)));
+          mRemote.transact(Stub.TRANSACTION_takesAnInterface, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.readInt();
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+      @Override public int takesAParcelable(android.test.CompoundParcelable.Subclass1 arg, android.test.CompoundParcelable.Subclass2 arg2) throws android.os.RemoteException
+      {
+        android.os.Parcel _data = android.os.Parcel.obtain();
+        android.os.Parcel _reply = android.os.Parcel.obtain();
+        int _result;
+        try {
+          _data.writeInterfaceToken(DESCRIPTOR);
+          if ((arg!=null)) {
+            _data.writeInt(1);
+            arg.writeToParcel(_data, 0);
+          }
+          else {
+            _data.writeInt(0);
+          }
+          if ((arg2!=null)) {
+            _data.writeInt(1);
+            arg2.writeToParcel(_data, 0);
+          }
+          else {
+            _data.writeInt(0);
+          }
+          mRemote.transact(Stub.TRANSACTION_takesAParcelable, _data, _reply, 0);
+          _reply.readException();
+          _result = _reply.readInt();
+          if ((0!=_reply.readInt())) {
+            arg2.readFromParcel(_reply);
+          }
+        }
+        finally {
+          _reply.recycle();
+          _data.recycle();
+        }
+        return _result;
+      }
+    }
+    static final int TRANSACTION_isEnabled = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
+    static final int TRANSACTION_getState = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
+    private boolean onTransact$getState$(android.os.Parcel data, android.os.Parcel reply) throws android.os.RemoteException
+    {
+      data.enforceInterface(DESCRIPTOR);
+      int _arg0;
+      _arg0 = data.readInt();
+      int _arg1;
+      _arg1 = data.readInt();
+      int _result = this.getState(_arg0, _arg1);
+      reply.writeNoException();
+      reply.writeInt(_result);
+      return true;
+    }
+    static final int TRANSACTION_getAddress = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
+    static final int TRANSACTION_getParcelables = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3);
+    static final int TRANSACTION_setScanMode = (android.os.IBinder.FIRST_CALL_TRANSACTION + 4);
+    private boolean onTransact$setScanMode$(android.os.Parcel data, android.os.Parcel reply) throws android.os.RemoteException
+    {
+      data.enforceInterface(DESCRIPTOR);
+      int _arg0;
+      _arg0 = data.readInt();
+      int _arg1;
+      _arg1 = data.readInt();
+      boolean _result = this.setScanMode(_arg0, _arg1);
+      reply.writeNoException();
+      reply.writeInt(((_result)?(1):(0)));
+      return true;
+    }
+    static final int TRANSACTION_registerBinder = (android.os.IBinder.FIRST_CALL_TRANSACTION + 5);
+    private boolean onTransact$registerBinder$(android.os.Parcel data, android.os.Parcel reply) throws android.os.RemoteException
+    {
+      data.enforceInterface(DESCRIPTOR);
+      android.bar.IAuxInterface _arg0;
+      _arg0 = android.bar.IAuxInterface.Stub.asInterface(data.readStrongBinder());
+      this.registerBinder(_arg0);
+      reply.writeNoException();
+      return true;
+    }
+    static final int TRANSACTION_getRecursiveBinder = (android.os.IBinder.FIRST_CALL_TRANSACTION + 6);
+    private boolean onTransact$getRecursiveBinder$(android.os.Parcel data, android.os.Parcel reply) throws android.os.RemoteException
+    {
+      data.enforceInterface(DESCRIPTOR);
+      android.test.IExampleInterface _result = this.getRecursiveBinder();
+      reply.writeNoException();
+      reply.writeStrongBinder((((_result!=null))?(_result.asBinder()):(null)));
+      return true;
+    }
+    static final int TRANSACTION_takesAnInterface = (android.os.IBinder.FIRST_CALL_TRANSACTION + 7);
+    private boolean onTransact$takesAnInterface$(android.os.Parcel data, android.os.Parcel reply) throws android.os.RemoteException
+    {
+      data.enforceInterface(DESCRIPTOR);
+      android.test.IAuxInterface2 _arg0;
+      _arg0 = android.test.IAuxInterface2.Stub.asInterface(data.readStrongBinder());
+      int _result = this.takesAnInterface(_arg0);
+      reply.writeNoException();
+      reply.writeInt(_result);
+      return true;
+    }
+    static final int TRANSACTION_takesAParcelable = (android.os.IBinder.FIRST_CALL_TRANSACTION + 8);
+    private boolean onTransact$takesAParcelable$(android.os.Parcel data, android.os.Parcel reply) throws android.os.RemoteException
+    {
+      data.enforceInterface(DESCRIPTOR);
+      android.test.CompoundParcelable.Subclass1 _arg0;
+      if ((0!=data.readInt())) {
+        _arg0 = android.test.CompoundParcelable.Subclass1.CREATOR.createFromParcel(data);
+      }
+      else {
+        _arg0 = null;
+      }
+      android.test.CompoundParcelable.Subclass2 _arg1;
+      if ((0!=data.readInt())) {
+        _arg1 = android.test.CompoundParcelable.Subclass2.CREATOR.createFromParcel(data);
+      }
+      else {
+        _arg1 = null;
+      }
+      int _result = this.takesAParcelable(_arg0, _arg1);
+      reply.writeNoException();
+      reply.writeInt(_result);
+      if ((_arg1!=null)) {
+        reply.writeInt(1);
+        _arg1.writeToParcel(reply, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
+      }
+      else {
+        reply.writeInt(0);
+      }
+      return true;
+    }
+  }
+  public static final int EXAMPLE_CONSTANT = 3;
+  public boolean isEnabled() throws android.os.RemoteException;
+  public int getState(int a, int b) throws android.os.RemoteException;
+  public java.lang.String getAddress() throws android.os.RemoteException;
+  /* Test long comment */
+  public android.foo.ExampleParcelable[] getParcelables() throws android.os.RemoteException;
+  // Test short comment
 
-public boolean setScanMode(int mode, int duration) throws android.os.RemoteException;
-/* Test long comment */// And short comment
+  public boolean setScanMode(int mode, int duration) throws android.os.RemoteException;
+  /* Test long comment */// And short comment
 
-public void registerBinder(android.bar.IAuxInterface foo) throws android.os.RemoteException;
-public android.test.IExampleInterface getRecursiveBinder() throws android.os.RemoteException;
-public int takesAnInterface(android.test.IAuxInterface2 arg) throws android.os.RemoteException;
-public int takesAParcelable(android.test.CompoundParcelable.Subclass1 arg, android.test.CompoundParcelable.Subclass2 arg2) throws android.os.RemoteException;
+  public void registerBinder(android.bar.IAuxInterface foo) throws android.os.RemoteException;
+  public android.test.IExampleInterface getRecursiveBinder() throws android.os.RemoteException;
+  public int takesAnInterface(android.test.IAuxInterface2 arg) throws android.os.RemoteException;
+  public int takesAParcelable(android.test.CompoundParcelable.Subclass1 arg, android.test.CompoundParcelable.Subclass2 arg2) throws android.os.RemoteException;
 }
 )";
 
diff --git a/tests/test_data_ping_responder.cpp b/tests/test_data_ping_responder.cpp
index 40cb602..04fde03 100644
--- a/tests/test_data_ping_responder.cpp
+++ b/tests/test_data_ping_responder.cpp
@@ -99,135 +99,135 @@
 }
 
 ::android::binder::Status BpPingResponder::Ping(const ::android::String16& input, ::android::String16* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeString16(input);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IPingResponder::PING, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readString16(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeString16(input);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IPingResponder::PING, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readString16(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpPingResponder::NullablePing(const ::std::unique_ptr<::android::String16>& input, ::std::unique_ptr<::android::String16>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeString16(input);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IPingResponder::NULLABLEPING, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readString16(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeString16(input);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IPingResponder::NULLABLEPING, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readString16(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpPingResponder::Utf8Ping(const ::std::string& input, ::std::string* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeUtf8AsUtf16(input);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IPingResponder::UTF8PING, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readUtf8FromUtf16(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeUtf8AsUtf16(input);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IPingResponder::UTF8PING, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readUtf8FromUtf16(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 ::android::binder::Status BpPingResponder::NullableUtf8Ping(const ::std::unique_ptr<::std::string>& input, ::std::unique_ptr<::std::string>* _aidl_return) {
-::android::Parcel _aidl_data;
-::android::Parcel _aidl_reply;
-::android::status_t _aidl_ret_status = ::android::OK;
-::android::binder::Status _aidl_status;
-_aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_data.writeUtf8AsUtf16(input);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = remote()->transact(IPingResponder::NULLABLEUTF8PING, _aidl_data, &_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-if (!_aidl_status.isOk()) {
-return _aidl_status;
-}
-_aidl_ret_status = _aidl_reply.readUtf8FromUtf16(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-goto _aidl_error;
-}
-_aidl_error:
-_aidl_status.setFromStatusT(_aidl_ret_status);
-return _aidl_status;
+  ::android::Parcel _aidl_data;
+  ::android::Parcel _aidl_reply;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  ::android::binder::Status _aidl_status;
+  _aidl_ret_status = _aidl_data.writeInterfaceToken(getInterfaceDescriptor());
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_data.writeUtf8AsUtf16(input);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = remote()->transact(IPingResponder::NULLABLEUTF8PING, _aidl_data, &_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_ret_status = _aidl_status.readFromParcel(_aidl_reply);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  if (!_aidl_status.isOk()) {
+    return _aidl_status;
+  }
+  _aidl_ret_status = _aidl_reply.readUtf8FromUtf16(_aidl_return);
+  if (((_aidl_ret_status) != (::android::OK))) {
+    goto _aidl_error;
+  }
+  _aidl_error:
+  _aidl_status.setFromStatusT(_aidl_ret_status);
+  return _aidl_status;
 }
 
 }  // namespace os
@@ -241,122 +241,122 @@
 namespace os {
 
 ::android::status_t BnPingResponder::onTransact(uint32_t _aidl_code, const ::android::Parcel& _aidl_data, ::android::Parcel* _aidl_reply, uint32_t _aidl_flags) {
-::android::status_t _aidl_ret_status = ::android::OK;
-switch (_aidl_code) {
-case Call::PING:
-{
-::android::String16 in_input;
-::android::String16 _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readString16(&in_input);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-::android::binder::Status _aidl_status(Ping(in_input, &_aidl_return));
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeString16(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::NULLABLEPING:
-{
-::std::unique_ptr<::android::String16> in_input;
-::std::unique_ptr<::android::String16> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readString16(&in_input);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-::android::binder::Status _aidl_status(NullablePing(in_input, &_aidl_return));
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeString16(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::UTF8PING:
-{
-::std::string in_input;
-::std::string _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readUtf8FromUtf16(&in_input);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-::android::binder::Status _aidl_status(Utf8Ping(in_input, &_aidl_return));
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeUtf8AsUtf16(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-case Call::NULLABLEUTF8PING:
-{
-::std::unique_ptr<::std::string> in_input;
-::std::unique_ptr<::std::string> _aidl_return;
-if (!(_aidl_data.checkInterface(this))) {
-_aidl_ret_status = ::android::BAD_TYPE;
-break;
-}
-_aidl_ret_status = _aidl_data.readUtf8FromUtf16(&in_input);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-::android::binder::Status _aidl_status(NullableUtf8Ping(in_input, &_aidl_return));
-_aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-if (!_aidl_status.isOk()) {
-break;
-}
-_aidl_ret_status = _aidl_reply->writeUtf8AsUtf16(_aidl_return);
-if (((_aidl_ret_status) != (::android::OK))) {
-break;
-}
-}
-break;
-default:
-{
-_aidl_ret_status = ::android::BBinder::onTransact(_aidl_code, _aidl_data, _aidl_reply, _aidl_flags);
-}
-break;
-}
-if (_aidl_ret_status == ::android::UNEXPECTED_NULL) {
-_aidl_ret_status = ::android::binder::Status::fromExceptionCode(::android::binder::Status::EX_NULL_POINTER).writeToParcel(_aidl_reply);
-}
-return _aidl_ret_status;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  switch (_aidl_code) {
+  case Call::PING:
+  {
+    ::android::String16 in_input;
+    ::android::String16 _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readString16(&in_input);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    ::android::binder::Status _aidl_status(Ping(in_input, &_aidl_return));
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeString16(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::NULLABLEPING:
+  {
+    ::std::unique_ptr<::android::String16> in_input;
+    ::std::unique_ptr<::android::String16> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readString16(&in_input);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    ::android::binder::Status _aidl_status(NullablePing(in_input, &_aidl_return));
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeString16(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::UTF8PING:
+  {
+    ::std::string in_input;
+    ::std::string _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readUtf8FromUtf16(&in_input);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    ::android::binder::Status _aidl_status(Utf8Ping(in_input, &_aidl_return));
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeUtf8AsUtf16(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  case Call::NULLABLEUTF8PING:
+  {
+    ::std::unique_ptr<::std::string> in_input;
+    ::std::unique_ptr<::std::string> _aidl_return;
+    if (!(_aidl_data.checkInterface(this))) {
+      _aidl_ret_status = ::android::BAD_TYPE;
+      break;
+    }
+    _aidl_ret_status = _aidl_data.readUtf8FromUtf16(&in_input);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    ::android::binder::Status _aidl_status(NullableUtf8Ping(in_input, &_aidl_return));
+    _aidl_ret_status = _aidl_status.writeToParcel(_aidl_reply);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+    if (!_aidl_status.isOk()) {
+      break;
+    }
+    _aidl_ret_status = _aidl_reply->writeUtf8AsUtf16(_aidl_return);
+    if (((_aidl_ret_status) != (::android::OK))) {
+      break;
+    }
+  }
+  break;
+  default:
+  {
+    _aidl_ret_status = ::android::BBinder::onTransact(_aidl_code, _aidl_data, _aidl_reply, _aidl_flags);
+  }
+  break;
+  }
+  if (_aidl_ret_status == ::android::UNEXPECTED_NULL) {
+    _aidl_ret_status = ::android::binder::Status::fromExceptionCode(::android::binder::Status::EX_NULL_POINTER).writeToParcel(_aidl_reply);
+  }
+  return _aidl_ret_status;
 }
 
 }  // namespace os
@@ -382,17 +382,17 @@
 
 class IPingResponder : public ::android::IInterface {
 public:
-DECLARE_META_INTERFACE(PingResponder)
-virtual ::android::binder::Status Ping(const ::android::String16& input, ::android::String16* _aidl_return) = 0;
-virtual ::android::binder::Status NullablePing(const ::std::unique_ptr<::android::String16>& input, ::std::unique_ptr<::android::String16>* _aidl_return) = 0;
-virtual ::android::binder::Status Utf8Ping(const ::std::string& input, ::std::string* _aidl_return) = 0;
-virtual ::android::binder::Status NullableUtf8Ping(const ::std::unique_ptr<::std::string>& input, ::std::unique_ptr<::std::string>* _aidl_return) = 0;
-enum Call {
-  PING = ::android::IBinder::FIRST_CALL_TRANSACTION + 0,
-  NULLABLEPING = ::android::IBinder::FIRST_CALL_TRANSACTION + 1,
-  UTF8PING = ::android::IBinder::FIRST_CALL_TRANSACTION + 2,
-  NULLABLEUTF8PING = ::android::IBinder::FIRST_CALL_TRANSACTION + 3,
-};
+  DECLARE_META_INTERFACE(PingResponder)
+  virtual ::android::binder::Status Ping(const ::android::String16& input, ::android::String16* _aidl_return) = 0;
+  virtual ::android::binder::Status NullablePing(const ::std::unique_ptr<::android::String16>& input, ::std::unique_ptr<::android::String16>* _aidl_return) = 0;
+  virtual ::android::binder::Status Utf8Ping(const ::std::string& input, ::std::string* _aidl_return) = 0;
+  virtual ::android::binder::Status NullableUtf8Ping(const ::std::unique_ptr<::std::string>& input, ::std::unique_ptr<::std::string>* _aidl_return) = 0;
+  enum Call {
+    PING = ::android::IBinder::FIRST_CALL_TRANSACTION + 0,
+    NULLABLEPING = ::android::IBinder::FIRST_CALL_TRANSACTION + 1,
+    UTF8PING = ::android::IBinder::FIRST_CALL_TRANSACTION + 2,
+    NULLABLEUTF8PING = ::android::IBinder::FIRST_CALL_TRANSACTION + 3,
+  };
 };  // class IPingResponder
 
 }  // namespace os
@@ -417,12 +417,12 @@
 
 class BpPingResponder : public ::android::BpInterface<IPingResponder> {
 public:
-explicit BpPingResponder(const ::android::sp<::android::IBinder>& _aidl_impl);
-virtual ~BpPingResponder() = default;
-::android::binder::Status Ping(const ::android::String16& input, ::android::String16* _aidl_return) override;
-::android::binder::Status NullablePing(const ::std::unique_ptr<::android::String16>& input, ::std::unique_ptr<::android::String16>* _aidl_return) override;
-::android::binder::Status Utf8Ping(const ::std::string& input, ::std::string* _aidl_return) override;
-::android::binder::Status NullableUtf8Ping(const ::std::unique_ptr<::std::string>& input, ::std::unique_ptr<::std::string>* _aidl_return) override;
+  explicit BpPingResponder(const ::android::sp<::android::IBinder>& _aidl_impl);
+  virtual ~BpPingResponder() = default;
+  ::android::binder::Status Ping(const ::android::String16& input, ::android::String16* _aidl_return) override;
+  ::android::binder::Status NullablePing(const ::std::unique_ptr<::android::String16>& input, ::std::unique_ptr<::android::String16>* _aidl_return) override;
+  ::android::binder::Status Utf8Ping(const ::std::string& input, ::std::string* _aidl_return) override;
+  ::android::binder::Status NullableUtf8Ping(const ::std::unique_ptr<::std::string>& input, ::std::unique_ptr<::std::string>* _aidl_return) override;
 };  // class BpPingResponder
 
 }  // namespace os
@@ -445,7 +445,7 @@
 
 class BnPingResponder : public ::android::BnInterface<IPingResponder> {
 public:
-::android::status_t onTransact(uint32_t _aidl_code, const ::android::Parcel& _aidl_data, ::android::Parcel* _aidl_reply, uint32_t _aidl_flags = 0) override;
+  ::android::status_t onTransact(uint32_t _aidl_code, const ::android::Parcel& _aidl_data, ::android::Parcel* _aidl_reply, uint32_t _aidl_flags = 0) override;
 };  // class BnPingResponder
 
 }  // namespace os
diff --git a/tests/test_data_string_constants.cpp b/tests/test_data_string_constants.cpp
index 1fb84d2..eae33e0 100644
--- a/tests/test_data_string_constants.cpp
+++ b/tests/test_data_string_constants.cpp
@@ -39,68 +39,68 @@
 package android.os;
 public interface IStringConstants extends android.os.IInterface
 {
-/** Local-side IPC implementation stub class. */
-public static abstract class Stub extends android.os.Binder implements android.os.IStringConstants
-{
-private static final java.lang.String DESCRIPTOR = "android.os.IStringConstants";
-/** Construct the stub at attach it to the interface. */
-public Stub()
-{
-this.attachInterface(this, DESCRIPTOR);
-}
-/**
- * Cast an IBinder object into an android.os.IStringConstants interface,
- * generating a proxy if needed.
- */
-public static android.os.IStringConstants asInterface(android.os.IBinder obj)
-{
-if ((obj==null)) {
-return null;
-}
-android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
-if (((iin!=null)&&(iin instanceof android.os.IStringConstants))) {
-return ((android.os.IStringConstants)iin);
-}
-return new android.os.IStringConstants.Stub.Proxy(obj);
-}
-@Override public android.os.IBinder asBinder()
-{
-return this;
-}
-@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
-{
-java.lang.String descriptor = DESCRIPTOR;
-switch (code)
-{
-case INTERFACE_TRANSACTION:
-{
-reply.writeString(descriptor);
-return true;
-}
-default:
-{
-return super.onTransact(code, data, reply, flags);
-}
-}
-}
-private static class Proxy implements android.os.IStringConstants
-{
-private android.os.IBinder mRemote;
-Proxy(android.os.IBinder remote)
-{
-mRemote = remote;
-}
-@Override public android.os.IBinder asBinder()
-{
-return mRemote;
-}
-public java.lang.String getInterfaceDescriptor()
-{
-return DESCRIPTOR;
-}
-}
-}
-public static final String EXAMPLE_CONSTANT = "foo";
+  /** Local-side IPC implementation stub class. */
+  public static abstract class Stub extends android.os.Binder implements android.os.IStringConstants
+  {
+    private static final java.lang.String DESCRIPTOR = "android.os.IStringConstants";
+    /** Construct the stub at attach it to the interface. */
+    public Stub()
+    {
+      this.attachInterface(this, DESCRIPTOR);
+    }
+    /**
+     * Cast an IBinder object into an android.os.IStringConstants interface,
+     * generating a proxy if needed.
+     */
+    public static android.os.IStringConstants asInterface(android.os.IBinder obj)
+    {
+      if ((obj==null)) {
+        return null;
+      }
+      android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
+      if (((iin!=null)&&(iin instanceof android.os.IStringConstants))) {
+        return ((android.os.IStringConstants)iin);
+      }
+      return new android.os.IStringConstants.Stub.Proxy(obj);
+    }
+    @Override public android.os.IBinder asBinder()
+    {
+      return this;
+    }
+    @Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
+    {
+      java.lang.String descriptor = DESCRIPTOR;
+      switch (code)
+      {
+        case INTERFACE_TRANSACTION:
+        {
+          reply.writeString(descriptor);
+          return true;
+        }
+        default:
+        {
+          return super.onTransact(code, data, reply, flags);
+        }
+      }
+    }
+    private static class Proxy implements android.os.IStringConstants
+    {
+      private android.os.IBinder mRemote;
+      Proxy(android.os.IBinder remote)
+      {
+        mRemote = remote;
+      }
+      @Override public android.os.IBinder asBinder()
+      {
+        return mRemote;
+      }
+      public java.lang.String getInterfaceDescriptor()
+      {
+        return DESCRIPTOR;
+      }
+    }
+  }
+  public static final String EXAMPLE_CONSTANT = "foo";
 }
 )";
 
@@ -123,8 +123,8 @@
 
 class IStringConstants : public ::android::IInterface {
 public:
-DECLARE_META_INTERFACE(StringConstants)
-static const ::android::String16& EXAMPLE_CONSTANT();
+  DECLARE_META_INTERFACE(StringConstants)
+  static const ::android::String16& EXAMPLE_CONSTANT();
 };  // class IStringConstants
 
 }  // namespace os
@@ -145,8 +145,8 @@
 IMPLEMENT_META_INTERFACE(StringConstants, "android.os.IStringConstants")
 
 const ::android::String16& IStringConstants::EXAMPLE_CONSTANT() {
-static const ::android::String16 value("foo");
-return value;
+  static const ::android::String16 value("foo");
+  return value;
 }
 
 }  // namespace os
@@ -174,18 +174,18 @@
 namespace os {
 
 ::android::status_t BnStringConstants::onTransact(uint32_t _aidl_code, const ::android::Parcel& _aidl_data, ::android::Parcel* _aidl_reply, uint32_t _aidl_flags) {
-::android::status_t _aidl_ret_status = ::android::OK;
-switch (_aidl_code) {
-default:
-{
-_aidl_ret_status = ::android::BBinder::onTransact(_aidl_code, _aidl_data, _aidl_reply, _aidl_flags);
-}
-break;
-}
-if (_aidl_ret_status == ::android::UNEXPECTED_NULL) {
-_aidl_ret_status = ::android::binder::Status::fromExceptionCode(::android::binder::Status::EX_NULL_POINTER).writeToParcel(_aidl_reply);
-}
-return _aidl_ret_status;
+  ::android::status_t _aidl_ret_status = ::android::OK;
+  switch (_aidl_code) {
+  default:
+  {
+    _aidl_ret_status = ::android::BBinder::onTransact(_aidl_code, _aidl_data, _aidl_reply, _aidl_flags);
+  }
+  break;
+  }
+  if (_aidl_ret_status == ::android::UNEXPECTED_NULL) {
+    _aidl_ret_status = ::android::binder::Status::fromExceptionCode(::android::binder::Status::EX_NULL_POINTER).writeToParcel(_aidl_reply);
+  }
+  return _aidl_ret_status;
 }
 
 }  // namespace os