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

Commit c0c958da authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: rpc java detach error code" am: 7f410d89 am: ed47da9f am: f5cb765f 

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



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

libs/binder/RpcSession.cpp

+3 −2
Original line number Diff line number Diff line
@@ -408,10 +408,11 @@ public: 
                            "Unable to detach thread. No JavaVM, but it was present before!");



        LOG_RPC_DETAIL("Detaching current thread from JVM");

        if (vm->DetachCurrentThread() != JNI_OK) {

        int ret = vm->DetachCurrentThread();

        if (ret == JNI_OK) {

            mAttached = false;

        } else {

            ALOGW("Unable to detach current thread from JVM");

            ALOGW("Unable to detach current thread from JVM (%d)", ret);

        }

    }