| commit | d3b3930cd218996c08b1c5c3992ed34d8acbdf4b | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Mon Jul 17 21:50:42 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 17 21:50:42 2023 +0000 |
| tree | f932abc796d8b00cd9e1116eb59ded232388f99c | |
| parent | 3ab5eae2bce4ac9403d651b3e62a6389f024cdc1 [diff] | |
| parent | 0bf061b868d77f143debd1f5897bafd78263faef [diff] |
Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: 5164539e78 am: 35d9c8c57d am: 0bf061b868 Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888 Change-Id: I5ed09450813a255cb895bbce58515c53feb6268c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libc/bionic/fdsan.cpp b/libc/bionic/fdsan.cpp index 84d2c94..0b0678b 100644 --- a/libc/bionic/fdsan.cpp +++ b/libc/bionic/fdsan.cpp
@@ -219,6 +219,8 @@ return "ZipArchive"; case ANDROID_FDSAN_OWNER_TYPE_NATIVE_HANDLE: return "native_handle_t"; + case ANDROID_FDSAN_OWNER_TYPE_PARCEL: + return "Parcel"; case ANDROID_FDSAN_OWNER_TYPE_GENERIC_00: default:
diff --git a/libc/include/android/fdsan.h b/libc/include/android/fdsan.h index 3de0649..4540498 100644 --- a/libc/include/android/fdsan.h +++ b/libc/include/android/fdsan.h
@@ -126,6 +126,9 @@ /* native_handle_t */ ANDROID_FDSAN_OWNER_TYPE_NATIVE_HANDLE = 13, + + /* android::Parcel */ + ANDROID_FDSAN_OWNER_TYPE_PARCEL = 14, }; /*