commit 5eb4fe3f2cb140f0cfd4be36388663458845dcab
author Jooyung Han <jooyung@google.com> Sun Nov 01 22:13:59 2020 +0900
committer Jooyung Han <jooyung@google.com> Tue Nov 24 13:43:58 2020 +0900
tree bbf2146f7acd1e14eafdf62a8cab530bb093d832
parent fb2a8b9ef7a4dec4512e8221731faa1368bcf58a

fix toString in the Java backend

Use Objects.toString(obj) to handle null

Bug: n/a
Bug: 150161123
Test: aidl_integration_test
Merged-In: I8bcc7346e4568df1e5371268a0acd9e14f386805
Change-Id: I8bcc7346e4568df1e5371268a0acd9e14f386805
(cherry picked from commit ee73cb33fb727f97ff39af6e8fcba7caa4156520)

aidl_to_java.cpp

diff --git a/aidl_to_java.cpp b/aidl_to_java.cpp
index 0967927..f4706a2 100644
--- a/aidl_to_java.cpp
+++ b/aidl_to_java.cpp
@@ -800,7 +800,7 @@
   // that they are actually user-defined types.
   AIDL_FATAL_IF(t == nullptr, c.type) << "Unknown type";
   if (t->AsInterface() != nullptr || t->AsParcelable() != nullptr) {
-    c.writer << c.var << ".toString()";
+    c.writer << "java.util.Objects.toString(" << c.var << ")";
     return;
   }
   CHECK(true) << "Unhandled typename: " << name << endl;