| commit | 0ab3f6cf1612793e1bf750a52f4adc59fc98ed1e | [log] [tgz] |
|---|---|---|
| author | Jayant Chowdhary <jchowdhary@google.com> | Fri Jun 19 22:44:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 19 22:44:00 2020 +0000 |
| tree | 64e9642f4b7be8efce891e2361cdc2cd0a693b76 | |
| parent | ebf2ce16a7859962cee8c6acda529445c38a5894 [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: I96f9adb09c575f0d238e89b25d9210f6c9f297e2
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 2dbe2e5..b36acb4 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(); } }