commit c3b4ed369e30c1b6da415894c80a624f6d440dcc
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 09 01:09:50 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 09 01:09:50 2022 +0000
tree 38aff4c69e3dc705e856504c3bb16d4bf626b236
parent 36ee8fa53bd8df89af8f57fe6004ba1d39b7100d
parent 0e3443d157b9d18bc1d9d6a26becb1ff930efa0d

Merge "Support BR_TRANSACTION_PENDING_FROZEN"

libs/binder/IPCThreadState.cpp

diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
index 7770374..c0f3e30 100644
--- a/libs/binder/IPCThreadState.cpp
+++ b/libs/binder/IPCThreadState.cpp
@@ -1017,6 +1017,10 @@
             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;

libs/binder/binder_module.h

diff --git a/libs/binder/binder_module.h b/libs/binder/binder_module.h
index 793795e..eef07ae 100644
--- a/libs/binder/binder_module.h
+++ b/libs/binder/binder_module.h
@@ -100,4 +100,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 // _BINDER_MODULE_H_