commit 188a42789130fb2c9768f66e7e0a038aea54dc28
author Steven Moreland <smoreland@google.com> Wed Sep 29 12:05:47 2021 -0700
committer Steven Moreland <smoreland@google.com> Thu Sep 30 17:59:46 2021 +0000
tree daa3a1888b76e666a7cf827a98adef795c7642f2
parent b248d07a4276b7487efaf5c29d3cf081a43bb97b

java: use Parcel.obtain(IBinder) not markForBinder

markForBinder is now private to Parcel.

Bug: 175814583
Test: aidl_integration_test
Change-Id: Ifd5d948ff94d850cf9dfc7a1fe5ab5c24e604b86

generate_java_binder.cpp

diff --git a/generate_java_binder.cpp b/generate_java_binder.cpp
index 12aee22..fbd977e 100644
--- a/generate_java_binder.cpp
+++ b/generate_java_binder.cpp
@@ -711,12 +711,12 @@
 
   // the parcels
   auto _data = std::make_shared<Variable>("android.os.Parcel", "_data");
-  proxy->statements->Add(std::make_shared<VariableDeclaration>(
-      _data, std::make_shared<MethodCall>("android.os.Parcel", "obtain")));
-
   if (options.GenRpc()) {
-    proxy->statements->Add(
-        std::make_shared<LiteralStatement>("_data.markForBinder(asBinder());\n"));
+    proxy->statements->Add(std::make_shared<LiteralStatement>(
+        "android.os.Parcel _data = android.os.Parcel.obtain(asBinder());\n"));
+  } else {
+    proxy->statements->Add(std::make_shared<LiteralStatement>(
+        "android.os.Parcel _data = android.os.Parcel.obtain();\n"));
   }
 
   if (iface.IsSensitiveData()) {