commit 5f5924749900e2fa6870ff5fb83c6fc3d4ed66d4
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jun 07 01:23:46 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 07 01:23:46 2022 +0000
tree 3aabb663e7e0406cfe44fc3a432031426b4b1140
parent 5f472231c4de75cb50151b3f262db08020cabffc
parent 19d7f9d2fe97567bf43e88e463f0601cec790963

Merge cherrypicks of [17395476] into rvc-platform-release. am: 19d7f9d2fe

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

Change-Id: I8b39a0cab834762ff707001b1a604f6ed28b231e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

generate_cpp.cpp

diff --git a/generate_cpp.cpp b/generate_cpp.cpp
index 284c67f..e77142b 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 5d60599..87c4b56 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;
 }