| commit | d14146aa307a3eb293ee7d40fd3d6c7d7784b24e | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Mon Jul 17 21:51:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 17 21:51:04 2023 +0000 |
| tree | f932abc796d8b00cd9e1116eb59ded232388f99c | |
| parent | 932ea7283d96e68e2ec5692d56a144cc6082b709 [diff] | |
| parent | 052fa2130c7503fc6127c492d0555e8a4fccaf04 [diff] |
Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: af594059f4 am: 6a53c1a805 am: 052fa2130c Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888 Change-Id: I1040e44d9340a4c784965a9f001aaa9b125d84ee 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, }; /*