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

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

Merge "OomConnection: Verify memory listener state" into main am: ffd9e2bb 

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



Change-Id: Icc99a842220ec1b7e9a9ff5489ed70d82535e55b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1cdd89d ffd9e2bb

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");