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

Commit 9288ad85 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "cameraserver: remove assumption that status change callbacks... 

Merge "Merge "cameraserver: remove assumption that status change callbacks must be called from cameraserver process." into rvc-dev am: f00b91b9 am: 0ab3f6cf" into rvc-d1-dev-plus-aosp
parents 5bde6c33 ac720e31

services/camera/libcameraservice/CameraService.cpp

+0 −3
Original line number Diff line number Diff line
@@ -496,9 +496,6 @@ void CameraService::disconnectClient(const String8& id, sp<BasicClient> clientTo 
        clientToDisconnect->notifyError(

                hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_DISCONNECTED,

                CaptureResultExtras{});

        // Ensure not in binder RPC so client disconnect PID checks work correctly

        LOG_ALWAYS_FATAL_IF(CameraThreadState::getCallingPid() != getpid(),

                "onDeviceStatusChanged must be called from the camera service process!");

        clientToDisconnect->disconnect();

    }

}