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

am: c3ee35f339 Change-Id: I89bd43ae46fafefe3ae3c94289ef28fea62efdd6
6 years ago · 05ca87ccf4
parent b4dfe1c017 c3ee35f339
commit 05ca87ccf4
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;