commit ca5a64b52d5a8f169f1ae605de0c3141bd08bc4d
author Linux Build Service Account <lnxbuild@localhost> Tue Jul 12 03:24:08 2022 -0700
committer Linux Build Service Account <lnxbuild@localhost> Tue Jul 12 03:24:08 2022 -0700
tree f52737ff7e09094704d55385921dbf1e1deb55b9
parent 7c06894fce31db477963acc08f1fb751a885566a
parent 9884b8fc47f348153b0dd5a5c204271c7f1b873a

Merge 9884b8fc47f348153b0dd5a5c204271c7f1b873a on remote branch

Change-Id: I398c4317767b7e0c499d1b4fb42af64ea9486441

generate_cpp.cpp

diff --git a/generate_cpp.cpp b/generate_cpp.cpp
index bbee9b3..b9b2d12 100644
--- a/generate_cpp.cpp
+++ b/generate_cpp.cpp
@@ -1118,6 +1118,9 @@
           out << " = " << cppType << "(0)";
         }
       }
+    } else if (AidlTypenames::IsPrimitiveTypename(variable->GetType().GetName()) &&
+               !variable->GetType().IsArray()) {
+      out << " = {}";
     }
     out << ";\n";
 

generate_ndk.cpp

diff --git a/generate_ndk.cpp b/generate_ndk.cpp
index 0efd7eb..d8a29aa 100644
--- a/generate_ndk.cpp
+++ b/generate_ndk.cpp
@@ -886,6 +886,9 @@
           out << " = " << NdkNameOf(types, variable->GetType(), StorageMode::STACK) << "(0)";
         }
       }
+    } else if (AidlTypenames::IsPrimitiveTypename(variable->GetType().GetName()) &&
+               !variable->GetType().IsArray()) {
+      out << " = {}";
     }
     out << ";\n";
   }

tests/android/aidl/tests/StructuredParcelable.aidl

diff --git a/tests/android/aidl/tests/StructuredParcelable.aidl b/tests/android/aidl/tests/StructuredParcelable.aidl
index 28046e2..0908782 100644
--- a/tests/android/aidl/tests/StructuredParcelable.aidl
+++ b/tests/android/aidl/tests/StructuredParcelable.aidl
@@ -158,5 +158,16 @@
     // String expressions
     @utf8InCpp String addString1 = "hello" + " world!";
     @utf8InCpp String addString2 = "The quick brown fox jumps " + "over the lazy dog.";
+
+    // primitive types will be initialized with {}.
+    boolean aBoolean;
+    byte aByte;
+    char aChar;
+    int anInt;
+    long aLong;
+    float aFloat;
+    double aDouble;
+    // arrays are not primitive type.
+    int[] anIntArray;
 }