Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NativeMessageQueue: ensure nativeDestroy success" am: 1a4ac8e6aa am: ad5979611a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2202591

Change-Id: I7d704f54384fa14c51856a9a361f74bf539b8362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Steven Moreland
2022-09-22 02:45:40 +00:00
committed by Automerger Merge Worker
parent b883281ecc ad5979611a
commit 8d8831bbfa
1 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/jni/android_os_MessageQueue.cpp
View File

@@ -51,6 +51,21 @@ public:
virtual int handleEvent(int fd, int events, void* data);
/**
* A simple proxy that holds a weak reference to a looper callback.
*/
class WeakLooperCallback : public LooperCallback {
protected:
virtual ~WeakLooperCallback();
public:
WeakLooperCallback(const wp<LooperCallback>& callback);
virtual int handleEvent(int fd, int events, void* data);
private:
wp<LooperCallback> mCallback;
};
private:
JNIEnv* mPollEnv;
jobject mPollObj;
@@ -131,7 +146,8 @@ void NativeMessageQueue::setFileDescriptorEvents(int fd, int events) {
if (events & CALLBACK_EVENT_OUTPUT) {
looperEvents |= Looper::EVENT_OUTPUT;
}
mLooper->addFd(fd, Looper::POLL_CALLBACK, looperEvents, this,
mLooper->addFd(fd, Looper::POLL_CALLBACK, looperEvents,
sp<WeakLooperCallback>::make(this),
reinterpret_cast<void*>(events));
} else {
mLooper->removeFd(fd);
@@ -162,6 +178,24 @@ int NativeMessageQueue::handleEvent(int fd, int looperEvents, void* data) {
}
// --- NativeMessageQueue::WeakLooperCallback ---
NativeMessageQueue::WeakLooperCallback::WeakLooperCallback(const wp<LooperCallback>& callback) :
mCallback(callback) {
}
NativeMessageQueue::WeakLooperCallback::~WeakLooperCallback() {
}
int NativeMessageQueue::WeakLooperCallback::handleEvent(int fd, int events, void* data) {
sp<LooperCallback> callback = mCallback.promote();
if (callback != nullptr) {
return callback->handleEvent(fd, events, data);
}
return 0;
}
// ----------------------------------------------------------------------------
sp<MessageQueue> android_os_MessageQueue_getMessageQueue(JNIEnv* env, jobject messageQueueObj) {