| commit | e1aedc5a83ba7cc1d2849b5c6d6272e29bc7fe51 | [log] [tgz] |
|---|---|---|
| author | Shuzhen Wang <shuzhenwang@google.com> | Tue Nov 20 10:04:08 2018 -0800 |
| committer | Peter Kalauskas <peskal@google.com> | Tue Nov 27 17:29:53 2018 +0000 |
| tree | e9d84108fe5d06f1ab7a0cf8287356eb3337cf63 | |
| parent | 18697362534415319b635dbdc96bfb43769b327a [diff] [blame] |
Camera: Do not update state at HAL starts up if state already exists This is to handle lazy hal, where cameraserver doesn't know HAL goes away. Test: Observe that the between QS Torch Tile and Camera App is correct. Bug: 79374634 Merged-In: I2f802b1c409ba3581f0fcacfc0ac5f6059391139 Change-Id: I2f802b1c409ba3581f0fcacfc0ac5f6059391139
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index ac694ec..ba0244e 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp
@@ -181,7 +181,9 @@ for (auto& cameraId : deviceIds) { String8 id8 = String8(cameraId.c_str()); - onDeviceStatusChanged(id8, CameraDeviceStatus::PRESENT); + if (getCameraState(id8) == nullptr) { + onDeviceStatusChanged(id8, CameraDeviceStatus::PRESENT); + } } return OK;