commit f6ec898795715aab42a1eb25d5ad8ad267a7b3e7
author Jeongik Cha <jeongik@google.com> Thu Oct 15 00:10:30 2020 +0900
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 28 01:43:56 2020 +0000
tree 9d4d6f42aba83e7cf09d824b4062e837ce7981e6
parent 378fbd433f45bf8ae3176796f963ac374074999c

Forbid @nullable ParcelableHolder

ParcelableHolder is supposed to be always initialized due to its
stability value. So, restrict using @nullable for ParcelableHolder

Bug: 146611855
Bug: 170807936
Test: atest aidl_unittests
Change-Id: I4b2b3a837b02161a04462e075d76a42a8a9e6b8d

aidl_unittest.cpp

diff --git a/aidl_unittest.cpp b/aidl_unittest.cpp
index e58c9ce..654e5e0 100644
--- a/aidl_unittest.cpp
+++ b/aidl_unittest.cpp
@@ -1343,6 +1343,24 @@
             GetCapturedStderr());
 }
 
+TEST_P(AidlTest, RejectNullableParcelableHolderField) {
+  io_delegate_.SetFileContents("Foo.aidl", "parcelable Foo { @nullable ParcelableHolder ext; }");
+  Options options =
+      Options::From("aidl Foo.aidl --lang=" + Options::LanguageToString(GetLanguage()));
+  const string expected_stderr = "ERROR: Foo.aidl:1.27-44: ParcelableHolder cannot be nullable.\n";
+  CaptureStderr();
+  EXPECT_NE(0, ::android::aidl::compile_aidl(options, io_delegate_));
+  if (GetLanguage() == Options::Language::RUST) {
+    EXPECT_EQ(
+        "ERROR: Foo.aidl:1.27-44: ParcelableHolder cannot be nullable.\n"
+        "ERROR: Foo.aidl:1.27-44: The Rust backend does not support ParcelableHolder "
+        "yet.\n",
+        GetCapturedStderr());
+    return;
+  }
+  EXPECT_EQ(expected_stderr, GetCapturedStderr());
+}
+
 TEST_F(AidlTest, ApiDump) {
   io_delegate_.SetFileContents(
       "foo/bar/IFoo.aidl",