Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78d87f74 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support BR_TRANSACTION_PENDING_FROZEN" am: c3b4ed36 am: 7b6b8b4c am: 1a9d5f69 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2334883



Change-Id: Ie1eb54ee0a21f4748aa71faa67fe28ce9c2620af
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 06db476c 1a9d5f69

libs/binder/IPCThreadState.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1017,6 +1017,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;

libs/binder/binder_module.h

+5 −0
Original line number Diff line number Diff line
@@ -100,4 +100,9 @@ struct binder_frozen_status_info { 
#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_