summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Li <dualli@google.com>2024-02-05 17:49:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-05 17:49:28 +0000
commit6f7a6c7f70af889797d8677679aa07b3f2b6a0c6 (patch)
tree914f703f1c29927bbd93317b537fd87f0691825d
parent1f6c1cee033a8f952d19e51af9694eb40c101be5 (diff)
parent5006d0b4fdcf660c8fb73f97d317cdbe6b1aa6b6 (diff)
downloadlibhwbinder-6f7a6c7f70af889797d8677679aa07b3f2b6a0c6.tar.gz
Support BR_TRANSACTION_PENDING_FROZEN am: 5006d0b4fd
Original change: https://android-review.googlesource.com/c/platform/system/libhwbinder/+/2948763 Change-Id: Iafb61fb1ef0881090a6a333ca25b75e55e90312a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--IPCThreadState.cpp4
-rw-r--r--binder_kernel.h5
2 files changed, 9 insertions, 0 deletions
diff --git a/IPCThreadState.cpp b/IPCThreadState.cpp
index 2084a81..40e399b 100644
--- a/IPCThreadState.cpp
+++ b/IPCThreadState.cpp
@@ -812,6 +812,10 @@ status_t IPCThreadState::waitForResponse(Parcel *reply, status_t *acquireResult)
if (!reply && !acquireResult) goto finish;
break;
+ case BR_TRANSACTION_PENDING_FROZEN:
+ ALOGW("Sending oneway calls to frozen process.");
+ goto finish;
+
case BR_DEAD_REPLY:
err = DEAD_OBJECT;
goto finish;
diff --git a/binder_kernel.h b/binder_kernel.h
index 2695f51..648bab4 100644
--- a/binder_kernel.h
+++ b/binder_kernel.h
@@ -39,4 +39,9 @@
#define BINDER_ENABLE_ONEWAY_SPAM_DETECTION _IOW('b', 16, __u32)
#endif //BINDER_ENABLE_ONEWAY_SPAM_DETECTION
+#ifndef BR_TRANSACTION_PENDING_FROZEN
+// Temporary definition of BR_TRANSACTION_PENDING_FROZEN until UAPI binder.h includes it.
+#define BR_TRANSACTION_PENDING_FROZEN _IO('r', 20)
+#endif // BR_TRANSACTION_PENDING_FROZEN
+
#endif // ANDROID_HARDWARE_BINDER_KERNEL_H