JavaOnlyImmutable paracelable with enum fields am: 09e551ca1b am: 897412e024 am: 3dac227401

Original change: https://android-review.googlesource.com/c/platform/system/tools/aidl/+/1702646

Change-Id: I1e6017f5d1ebc7353b650dfb4688c89fd0376f43

2 files changed, 12 insertions, 0 deletions

diff --git a/aidl_typenames.cpp b/aidl_typenames.cpp
index 693899d6..84404637 100644
--- a/aidl_typenames.cpp
+++ b/aidl_typenames.cpp
@@ -260,6 +260,9 @@ bool AidlTypenames::CanBeJavaOnlyImmutable(const AidlTypeSpecifier& type) const
                         "type, and String.";
     return false;
   }
+  if (t->AsEnumDeclaration()) {
+    return true;
+  }
   return t->IsJavaOnlyImmutable();
 }
 
diff --git a/aidl_unittest.cpp b/aidl_unittest.cpp
index 1e81de74..c3c04dfb 100644
--- a/aidl_unittest.cpp
+++ b/aidl_unittest.cpp
@@ -3202,6 +3202,15 @@ TEST_F(AidlTest, RejectMutableParcelableFromJavaOnlyImmutableParcelable) {
   EXPECT_EQ(expected_error, GetCapturedStderr());
 }
 
+TEST_F(AidlTest, JavaOnlyImmutableParcelableWithEnumFields) {
+  io_delegate_.SetFileContents("Foo.aidl", "@JavaOnlyImmutable parcelable Foo { Bar bar; }");
+  io_delegate_.SetFileContents("Bar.aidl", "enum Bar { FOO }");
+  CaptureStderr();
+  Options options = Options::From("aidl --lang=java Foo.aidl -I .");
+  EXPECT_EQ(0, ::android::aidl::compile_aidl(options, io_delegate_));
+  EXPECT_EQ("", GetCapturedStderr());
+}
+
 TEST_F(AidlTest, RejectMutableParcelableFromJavaOnlyImmutableUnion) {
   io_delegate_.SetFileContents("Foo.aidl", "@JavaOnlyImmutable union Foo { Bar bar; }");
   io_delegate_.SetFileContents("Bar.aidl", "parcelable Bar { String a; }");