| commit | e0e385cf14c9c37d3e2c78b6efbc9c30551b5639 | [log] [tgz] |
|---|---|---|
| author | T.J. Mercier <tjmercier@google.com> | Tue Dec 20 23:08:40 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 20 23:08:40 2022 +0000 |
| tree | c70a0c9b6331b1cc277310fad207180a3e985484 | |
| parent | 748e88a1900e14caa51f6979893dea7713a8995b [diff] | |
| parent | 8969522cdc6d2ac8e55c5e3378bef9c5490c2850 [diff] |
Merge "Do not set FLAT_BINDER_FLAG_* on object of type BINDER_TYPE_FD" am: cbb975dcef am: 8969522cdc Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2363997 Change-Id: If3ce66087ed224e2a298900420071de97c6612e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index ee081c4..44ff62b 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp
@@ -1475,7 +1475,7 @@ #ifdef BINDER_WITH_KERNEL_IPC flat_binder_object obj; obj.hdr.type = BINDER_TYPE_FD; - obj.flags = 0x7f | FLAT_BINDER_FLAG_ACCEPTS_FDS; + obj.flags = 0; obj.binder = 0; /* Don't pass uninitialized stack data to a remote process */ obj.handle = fd; obj.cookie = takeOwnership ? 1 : 0;