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

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

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

Merge "cameraserver: remove assumption that status change callbacks must be called from cameraserver process." am: 1dc8f62a

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1344841

Change-Id: I65fb444f86998181a55842dbbf55fc56a9cc9ce1
parents 91778d9b 1dc8f62a

services/camera/libcameraservice/CameraService.cpp

+0 −3
Original line number Diff line number Diff line
@@ -379,9 +379,6 @@ void CameraService::onDeviceStatusChanged(const String8& id, 
            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();

        }