| commit | 89ac84b4a995da4f7ca190d18d54c80ef6ad07fe | [log] [tgz] |
|---|---|---|
| author | Jayant Chowdhary <jchowdhary@google.com> | Fri Jun 19 22:43:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 19 22:43:59 2020 +0000 |
| tree | 5891cf6b21f357337627ee8f1c274bf553e13966 | |
| parent | f42a519be4de7ef5f8100569378aa0fa974e2ab4 [diff] | |
| parent | f00b91b986fca9d87b900ed0e34c963bb85519f1 [diff] |
Merge "cameraserver: remove assumption that status change callbacks must be called from cameraserver process." into rvc-dev am: f00b91b986 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11816228 Change-Id: If6c59c6ce61ae77c8428906db4d80dfb18bd3972
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 4e4fc4f..2d03b56 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp
@@ -496,9 +496,6 @@ 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(); } }