commit f01ff3a51ebb078856dab22af43f7b1ee16a2e6d
author Steven Moreland <smoreland@google.com> Thu Sep 17 23:37:45 2020 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 18 02:24:48 2020 +0000
tree abe639738ee1b755d6fd9ac3728b3b9d82167656
parent e06f7297d11975a17b60c5de230c1668f456044d

aidl_to_java: turn on disabled error

An error was accidentally CHECK(true) instead of CHECK(false).
Enabling it now.

Fixes: 168261721
Test: aidl_unittests, mma
Change-Id: Ic484265695b9a455476c551ce68e419b63ddbad5

aidl_to_java.cpp

diff --git a/aidl_to_java.cpp b/aidl_to_java.cpp
index 3921281..9bb9052 100644
--- a/aidl_to_java.cpp
+++ b/aidl_to_java.cpp
@@ -33,7 +33,6 @@
 
 using android::base::Join;
 
-using std::endl;
 using std::function;
 using std::map;
 using std::string;
@@ -273,7 +272,7 @@
              }
            } else {
              const AidlDefinedType* t = c.typenames.TryGetDefinedType(contained_type);
-             AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type: " << contained_type << endl;
+             AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type: " << contained_type;
              if (t->AsParcelable() != nullptr) {
                c.writer << c.parcel << ".writeTypedList(" << c.var << ");\n";
              }
@@ -380,7 +379,7 @@
     found->second(c);
   } else {
     const AidlDefinedType* t = c.typenames.TryGetDefinedType(c.type.GetName());
-    AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type: " << c.type.GetName() << endl;
+    AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type: " << c.type.GetName();
     if (t->AsInterface() != nullptr) {
       if (!c.type.IsArray()) {
         // Why don't we use writeStrongInterface which does the exact same thing?
@@ -501,7 +500,7 @@
              }
            } else {
              const AidlDefinedType* t = c.typenames.TryGetDefinedType(contained_type);
-             AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type: " << contained_type << endl;
+             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)
@@ -615,7 +614,7 @@
     found->second(c);
   } else {
     const AidlDefinedType* t = c.typenames.TryGetDefinedType(c.type.GetName());
-    AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type: " << c.type.GetName() << endl;
+    AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type: " << c.type.GetName();
     if (t->AsInterface() != nullptr) {
       if (!c.type.IsArray()) {
         c.writer << c.var << " = " << c.type.GetName() << ".Stub.asInterface(" << c.parcel
@@ -691,7 +690,7 @@
              }
            } else {
              const AidlDefinedType* t = c.typenames.TryGetDefinedType(contained_type);
-             AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type: " << contained_type << endl;
+             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)
@@ -762,7 +761,7 @@
     found->second(c);
   } else {
     const AidlDefinedType* t = c.typenames.TryGetDefinedType(c.type.GetName());
-    AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type: " << c.type.GetName() << endl;
+    AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type: " << c.type.GetName();
     if (t->AsParcelable() != nullptr) {
       if (c.type.IsArray()) {
         c.writer << c.parcel << ".readTypedArray(" << c.var << ", " << c.type.GetName()
@@ -821,8 +820,7 @@
     return;
   }
 
-  // TODO(b/168261721): turn into a real error
-  // CHECK(true) << "Unhandled typename: " << name << endl;
+  AIDL_FATAL(AIDL_LOCATION_HERE) << "Unhandled typename: " << name;
 }
 
 }  // namespace java