Snap for 10453563 from 5ba9115da292a2527e8aeac19cef35d468173f85 to mainline-uwb-releaseaml_uwb_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000android14-mainline-uwb-release

Change-Id: I15efd9312f508313badef8743e620f6cd1614ca2

1 files changed, 9 insertions, 3 deletions

diff --git a/Interface.cpp b/Interface.cpp
index 9be88e9f..e9950d22 100644
--- a/Interface.cpp
+++ b/Interface.cpp
@@ -307,9 +307,15 @@ bool Interface::fillHashChainMethod(Method *method) const {
         } } }, /* cppImpl */
         { { IMPL_INTERFACE, [this, digestType, chainType](auto &out) {
             std::vector<const Interface *> chain = typeChain();
-            out << "return new "
-                << chainType->getJavaType(false /* forInitializer */)
-                << "(java.util.Arrays.asList(\n";
+            out << "return new " << chainType->getJavaType(false /* forInitializer */);
+            if (chain.size() == 1) {
+                // https://errorprone.info/bugpattern/ArraysAsListPrimitiveArray
+                // To avoid an ArraysAsListPrimitiveArray errorprone error, use
+                // singletonList when there's only 1 element in the chain.
+                out << "(java.util.Collections.singletonList(\n";
+            } else {
+                out << "(java.util.Arrays.asList(\n";
+            }
             out.indent(2, [&] {
                 // No need for dimensions when elements are explicitly provided.
                 emitDigestChain(out, "new " + digestType->getJavaType(false /* forInitializer */),