commit 8f3580e9da652f5bda3ee4746c8cd633f11243ca
author Joe Onorato <joeo@google.com> Tue Oct 18 18:17:32 2011 -0700
committer Mike Lockwood <lockwood@android.com> Fri Oct 28 10:14:52 2011 -0400
tree b735360d4352421e9098e766f002f5281f7441dd
parent 47f2f8340f2a1390d3b346adf6b8ca8e93079cad

Revert "Treat parcelables as flattenables for now, until the sdk contains a newer aidl."

Change-Id: I8f588d160888550ee79564afe6935fd0f78bc1f7

tools/aidl/aidl_language_y.y

diff --git a/tools/aidl/aidl_language_y.y b/tools/aidl/aidl_language_y.y
index 4b1442a..cc04d15 100644
--- a/tools/aidl/aidl_language_y.y
+++ b/tools/aidl/aidl_language_y.y
@@ -87,9 +87,7 @@
                                                         b->name = $2.buffer;
                                                         b->package = g_currentPackage ? strdup(g_currentPackage) : NULL;
                                                         b->semicolon_token = $3.buffer;
-                                                        // TODO: Since we're having problems with funbundling, make all parcelables also flattenables.
-                                                        // b->flattening_methods = PARCELABLE_DATA;
-                                                        b->flattening_methods = PARCELABLE_DATA | RPC_DATA;
+                                                        b->flattening_methods = PARCELABLE_DATA;
                                                         $$.user_data = b;
                                                     }
     |   PARCELABLE ';'                              {