Revert "binder: race condition by parcel finalize"

Revert "binder: race condition by parcel finalize"

Revert submission 1553275-Bug139327211_V5

Reason for revert: causing a different race condition? b/187218964
Reverted Changes:
I9345f4439:binder: race condition by parcel finalize
Ib06e38e22:binder: race condition by parcel finalize

Bug: 187218964

Change-Id: Iebf76febdad5e231c814f1f8de454931cb9352c5
Merged-In: Iebf76febdad5e231c814f1f8de454931cb9352c5

2 files changed, 2 insertions, 8 deletions

diff --git a/core/java/android/os/BinderProxy.java b/core/java/android/os/BinderProxy.java
index 2a9b703583a6..d44b016cb5d0 100644
--- a/core/java/android/os/BinderProxy.java
+++ b/core/java/android/os/BinderProxy.java
@@ -565,8 +565,7 @@ public final class BinderProxy implements IBinder {
         }
 
         try {
-            boolean replyOwnsNative = (reply == null) ? false : reply.ownsNativeParcelObject();
-            return transactNative(code, data, reply, replyOwnsNative, flags);
+            return transactNative(code, data, reply, flags);
         } finally {
             if (transactListener != null) {
                 transactListener.onTransactEnded(session);
@@ -589,7 +588,7 @@ public final class BinderProxy implements IBinder {
      * Native implementation of transact() for proxies
      */
     public native boolean transactNative(int code, Parcel data, Parcel reply,
-            boolean replyOwnsNativeParcelObject, int flags) throws RemoteException;
+            int flags) throws RemoteException;
     /**
      * See {@link IBinder#linkToDeath(DeathRecipient, int)}
      */
diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index 50f390bce890..e06e7b6be90a 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -3736,9 +3736,4 @@ public final class Parcel {
     public long getBlobAshmemSize() {
         return nativeGetBlobAshmemSize(mNativePtr);
     }
-
-    /** @hide */
-    /*package*/ boolean ownsNativeParcelObject() {
-        return mOwnsNativeParcelObject;
-    }
 }