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

am: 05ca87ccf4

Change-Id: Ie7e5ab214485ab8eda9f3630a7df78486d1e0921

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;