Merge "Camera: Do not update state at HAL starts up if state already exists"

6 years ago · c3ee35f339
parent 9a4842894a e1aedc5a83
commit c3ee35f339
1 changed files with 3 additions and 1 deletions
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@ -181,7 +181,9 @@ status_t CameraService::enumerateProviders() {

    for (auto& cameraId : deviceIds) {
        String8 id8 = String8(cameraId.c_str());
-        onDeviceStatusChanged(id8, CameraDeviceStatus::PRESENT);
+        if (getCameraState(id8) == nullptr) {
+            onDeviceStatusChanged(id8, CameraDeviceStatus::PRESENT);
+        }
    }

    return OK;