commit ef9b0f69a7d1df72b13437bd05a747ea210a00a5
author Jooyung Han <jooyung@google.com> Wed Oct 14 21:52:55 2020 +0900
committer Jooyung Han <jooyung@google.com> Thu Oct 15 13:10:38 2020 +0000
tree 00d4ab9f25f1be0f39cb9967ca9c3c2db90a6dff
parent 1f14ab32ea486f748f8d308f6f5d764a0cd7629a

fix union "assertTag" exception message

It should say "bad access: "tag1", "tag2" is available."

Bug: 150948558
Test: aidl_unittests / aidl_integration_test
Change-Id: Ib4760d6688eb881f2096fbb481d2f3cbfe9e8001

aidl_unittest.cpp

diff --git a/aidl_unittest.cpp b/aidl_unittest.cpp
index dcc931d..2f4c7b3 100644
--- a/aidl_unittest.cpp
+++ b/aidl_unittest.cpp
@@ -2928,7 +2928,7 @@
 
   private void _assertTag(int tag) {
     if (getTag() != tag) {
-      throw new IllegalStateException("bad access: " + _tagString(tag) + ", " + _tagString(tag) + " is available.");
+      throw new IllegalStateException("bad access: " + _tagString(tag) + ", " + _tagString(getTag()) + " is available.");
     }
   }
   private String _tagString(int _tag) {

generate_java.cpp

diff --git a/generate_java.cpp b/generate_java.cpp
index 58c1870..daf4147 100644
--- a/generate_java.cpp
+++ b/generate_java.cpp
@@ -633,7 +633,7 @@
   out << "private void _assertTag(" + tag_type + " tag) {\n";
   out << "  if (getTag() != tag) {\n";
   out << "    throw new IllegalStateException(\"bad access: \" + _tagString(tag) + \", \" + "
-         "_tagString(tag) + \" is available.\");\n";
+         "_tagString(getTag()) + \" is available.\");\n";
   out << "  }\n";
   out << "}\n";
   // helper: _tagString