commit 22a7599a8b81fc7a6c1eec68de4cf0dc73c771b5
author android-build-team Robot <android-build-team-robot@google.com> Tue Dec 15 22:25:14 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Dec 15 22:25:14 2020 +0000
tree bbf2146f7acd1e14eafdf62a8cab530bb093d832
parent fc1068b40b8aa4d762a53dd6566d88ddf5e9cb9e
parent 5eb4fe3f2cb140f0cfd4be36388663458845dcab

Snap for 7035108 from 5eb4fe3f2cb140f0cfd4be36388663458845dcab to mainline-release

Change-Id: I70feef217c0c3fefebf0a88c628c1122cab91f4f

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;