commit 600c4e0cf37b3670b56c2b7da1e8821692d102ef
author Elliott Hughes <enh@google.com> Fri Jul 14 00:44:01 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 14 00:44:01 2023 +0000
tree 90e8c6a893ce4db6465213133e2f9aabab27517e
parent 8eae8d506cf2e2158a0da44ccfaa60fbc787e448
parent ab1745600605ac0e3cc5280d4a2fbfa0279f7000

Merge "Add __riscv_flush_icache() to <sys/cachectl.h>." into main am: a09f741c2a am: 953b78a72d am: 1cb2c81563 am: 7a62037690 am: 6efb89a064 am: ab17456006

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

Change-Id: Ie093fdfd7f8fe1d0e3c6aeec0ad389a432ce8d40
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,
 };
 
 /*