diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-08 01:31:15 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-08 01:31:15 +0000 |
| commit | 351de717173e3f11b7db2e577001117b84648b9f (patch) | |
| tree | 20f4804268614f0b6184ce0663b614860878384b | |
| parent | 1304372895ce9e947befb16a5c165ca3b440d7e7 (diff) | |
| parent | 71df1c94611ac626561681a8688a731658e238d4 (diff) | |
| download | libhwbinder-simpleperf-release.tar.gz | |
Snap for 11421525 from 71df1c94611ac626561681a8688a731658e238d4 to simpleperf-releasesimpleperf-release
Change-Id: I55b3ec3f4b3e5aa6434f3e756d9263476bc551c9
| -rw-r--r-- | IPCThreadState.cpp | 8 | ||||
| -rw-r--r-- | binder_kernel.h | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/IPCThreadState.cpp b/IPCThreadState.cpp index 6ae379f..e0c1ade 100644 --- a/IPCThreadState.cpp +++ b/IPCThreadState.cpp @@ -813,6 +813,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; @@ -1270,10 +1274,6 @@ status_t IPCThreadState::executeCommand(int32_t cmd) mProcess->spawnPooledThread(false); break; - case BR_TRANSACTION_PENDING_FROZEN: - ALOGW("Sending oneway calls to frozen process."); - break; - default: ALOGE("*** BAD COMMAND %d received from Binder driver\n", cmd); result = UNKNOWN_ERROR; 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 |