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

Commit 8788e880 authored by Carlos Galo's avatar Carlos Galo
Browse files

OomConnection: Verify memory listener state 



Add listener state check before performing actions on it.

Test: Verify `noteAppKill()` log with OOM victim data.
Test: m
Bug: 330393131
Change-Id: I60019d35e7b4d0526851f59cd919e8addeb81ac0
Signed-off-by: default avatarCarlos Galo <carlosgalo@google.com>
parent ff8a5a36

services/core/jni/com_android_server_am_OomConnection.cpp

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ static MemEventListener memevent_listener(MemEventClient::AMS); 
 * @throws java.lang.RuntimeException

 */

static jobjectArray android_server_am_OomConnection_waitOom(JNIEnv* env, jobject) {

    if (!memevent_listener.ok()) {

        memevent_listener.deregisterAllEvents();

        jniThrowRuntimeException(env, "Failed to initialize memevents listener");

        return nullptr;

    }



    if (!memevent_listener.registerEvent(MEM_EVENT_OOM_KILL)) {

        memevent_listener.deregisterAllEvents();

        jniThrowRuntimeException(env, "listener failed to register to OOM events");