commit a61aa23db86583f10f09a801d2cf4119fec59bfa
author Jooyung Han <jooyung@google.com> Tue Oct 20 04:00:08 2020 +0900
committer Jooyung Han <jooyung@google.com> Tue Oct 20 09:48:11 2020 +0900
tree 5b76b971507669782e87367fba2e9afc0e3a74b3
parent d2fa0236038686f5c0429aeedb497422976e011e

Add read/write for List<ParcelFileDescriptor> in Java

While ParcelableFileDescriptor is built-in type, it IS a parcelable. So
we can treat it just like defined parcelable types when reading/writing.

Bug: 171229850
Test: aidl_unittests / aidl_integration_test
Change-Id: I2fac70a80a39ce0ccae5c91b09e4d331333ec758

aidl_to_java.cpp

diff --git a/aidl_to_java.cpp b/aidl_to_java.cpp
index c5d3f97..9fa691a 100644
--- a/aidl_to_java.cpp
+++ b/aidl_to_java.cpp
@@ -264,18 +264,14 @@
        [](const CodeGeneratorContext& c) {
          if (c.type.IsGeneric()) {
            const string& contained_type = c.type.GetTypeParameters().at(0)->GetName();
-           if (AidlTypenames::IsBuiltinTypename(contained_type)) {
-             if (contained_type == "String") {
-               c.writer << c.parcel << ".writeStringList(" << c.var << ");\n";
-             } else if (contained_type == "IBinder") {
-               c.writer << c.parcel << ".writeBinderList(" << c.var << ");\n";
-             }
+           if (contained_type == "String") {
+             c.writer << c.parcel << ".writeStringList(" << c.var << ");\n";
+           } else if (contained_type == "IBinder") {
+             c.writer << c.parcel << ".writeBinderList(" << c.var << ");\n";
+           } else if (c.typenames.IsParcelable(contained_type)) {
+             c.writer << c.parcel << ".writeTypedList(" << c.var << ");\n";
            } else {
-             const AidlDefinedType* t = c.typenames.TryGetDefinedType(contained_type);
-             AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type: " << contained_type;
-             if (t->AsParcelable() != nullptr) {
-               c.writer << c.parcel << ".writeTypedList(" << c.var << ");\n";
-             }
+             AIDL_FATAL(c.type) << "write: NOT IMPLEMENTED for " << contained_type;
            }
          } else {
            c.writer << c.parcel << ".writeList(" << c.var << ");\n";
@@ -492,20 +488,16 @@
        [](const CodeGeneratorContext& c) {
          if (c.type.IsGeneric()) {
            const string& contained_type = c.type.GetTypeParameters().at(0)->GetName();
-           if (AidlTypenames::IsBuiltinTypename(contained_type)) {
-             if (contained_type == "String") {
-               c.writer << c.var << " = " << c.parcel << ".createStringArrayList();\n";
-             } else if (contained_type == "IBinder") {
-               c.writer << c.var << " = " << c.parcel << ".createBinderArrayList();\n";
-             }
+           if (contained_type == "String") {
+             c.writer << c.var << " = " << c.parcel << ".createStringArrayList();\n";
+           } else if (contained_type == "IBinder") {
+             c.writer << c.var << " = " << c.parcel << ".createBinderArrayList();\n";
+           } else if (c.typenames.IsParcelable(contained_type)) {
+             c.writer << c.var << " = " << c.parcel << ".createTypedArrayList("
+                      << JavaNameOf(*(c.type.GetTypeParameters().at(0)), c.typenames)
+                      << ".CREATOR);\n";
            } else {
-             const AidlDefinedType* t = c.typenames.TryGetDefinedType(contained_type);
-             AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type: " << contained_type;
-             if (t->AsParcelable() != nullptr) {
-               c.writer << c.var << " = " << c.parcel << ".createTypedArrayList("
-                        << JavaNameOf(*(c.type.GetTypeParameters().at(0)), c.typenames)
-                        << ".CREATOR);\n";
-             }
+             AIDL_FATAL(c.type) << "create: NOT IMPLEMENTED for " << contained_type;
            }
          } else {
            const string classloader = EnsureAndGetClassloader(const_cast<CodeGeneratorContext&>(c));
@@ -682,20 +674,16 @@
        [](const CodeGeneratorContext& c) {
          if (c.type.IsGeneric()) {
            const string& contained_type = c.type.GetTypeParameters().at(0)->GetName();
-           if (AidlTypenames::IsBuiltinTypename(contained_type)) {
-             if (contained_type == "String") {
-               c.writer << c.parcel << ".readStringList(" << c.var << ");\n";
-             } else if (contained_type == "IBinder") {
-               c.writer << c.parcel << ".readBinderList(" << c.var << ");\n";
-             }
+           if (contained_type == "String") {
+             c.writer << c.parcel << ".readStringList(" << c.var << ");\n";
+           } else if (contained_type == "IBinder") {
+             c.writer << c.parcel << ".readBinderList(" << c.var << ");\n";
+           } else if (c.typenames.IsParcelable(contained_type)) {
+             c.writer << c.parcel << ".readTypedList(" << c.var << ", "
+                      << JavaNameOf(*(c.type.GetTypeParameters().at(0)), c.typenames)
+                      << ".CREATOR);\n";
            } else {
-             const AidlDefinedType* t = c.typenames.TryGetDefinedType(contained_type);
-             AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type: " << contained_type;
-             if (t->AsParcelable() != nullptr) {
-               c.writer << c.parcel << ".readTypedList(" << c.var << ", "
-                        << JavaNameOf(*(c.type.GetTypeParameters().at(0)), c.typenames)
-                        << ".CREATOR);\n";
-             }
+             AIDL_FATAL(c.type) << "read: NOT IMPLEMENTED for " << contained_type;
            }
          } else {
            const string classloader = EnsureAndGetClassloader(const_cast<CodeGeneratorContext&>(c));