| commit | 53e1b370ce251cb2fd6b577e378f1243c777ca44 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Fri Jun 19 23:07:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 19 23:07:28 2020 +0000 |
| tree | 5891cf6b21f357337627ee8f1c274bf553e13966 | |
| parent | 33da4491c6a1e35e1d65a4bedafa9b8ebf0313c1 [diff] | |
| parent | 5bde6c3341a9ae7bfae165282c68718ebcad4c7f [diff] |
Merge "MediaMetrics: Retain previous audio state a limited time." into rvc-dev am: f3f98cc259 am: f42a519be4 am: 5bde6c3341 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11931279 Change-Id: I739e421f3f071ea6c0aa674e71e7fa8b285049a0
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(); } }