commit 7d87ca8d220a5d8b66a4e1b25d0dc434719683e0
author Elliott Hughes <enh@google.com> Sat Jul 15 00:03:36 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jul 15 00:03:36 2023 +0000
tree 6ee51ea9769a367a13379ef1e3f033e4080d3886
parent 600c4e0cf37b3670b56c2b7da1e8821692d102ef
parent b3c40e2f72c8f5cb7771ab5553dd716dcbf8a170

Merge "Add riscv_hwprobe to the seccomp allowlist." into main am: a2cdb247e1 am: e6cc982146 am: 3ace80b9b1 am: 71b7ceb20f am: b3c40e2f72

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2657071

Change-Id: I27519f6b01877d4f7cc62aac9ec8507a688a1f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libc/bionic/fdsan.cpp

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:

libc/include/android/fdsan.h

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,
 };
 
 /*