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

Commit b3e97b34 authored by Igor Murashkin's avatar Igor Murashkin Committed by Android (Google) Code Review
Browse files

Camera2: Fix trying to release HAL stream twice 

When we fail to disconnect the native window, StreamAdapter::release
would fail and remain in the old (ALLOCATED) state, thus it thinks that
we haven't released the HAL stream yet.

With this change, ignore DEAD_OBJECT native window disconnect failures,
so the state transitions to RELEASED and we don't double release HAL
streams.

Bug: 7258314
Change-Id: I524893e4b4d6463d7b0a7ce32fb6f658afba8e11
parent ecf17e82

services/camera/libcameraservice/Camera2Device.cpp

+11 −3
Original line number Diff line number Diff line
@@ -1115,9 +1115,17 @@ status_t Camera2Device::StreamAdapter::release() { 
    if (mState >= CONNECTED) {

        res = native_window_api_disconnect(mConsumerInterface.get(),

                NATIVE_WINDOW_API_CAMERA);

        if (res != OK) {

            ALOGE("%s: Unable to disconnect stream %d from native window",

                    __FUNCTION__, mId);



        /* this is not an error. if client calling process dies,

           the window will also die and all calls to it will return

           DEAD_OBJECT, thus it's already "disconnected" */

        if (res == DEAD_OBJECT) {

            ALOGW("%s: While disconnecting stream %d from native window, the"

                  " native window died from under us", __FUNCTION__, mId);

        }

        else if (res != OK) {

            ALOGE("%s: Unable to disconnect stream %d from native window (error %d %s)",

                    __FUNCTION__, mId, res, strerror(-res));

            return res;

        }

    }