commit 8c545704ea199e13c23f47cd8f4067bcdc25071f
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 28 00:04:13 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 28 00:04:13 2018 +0000
tree 406848d385216b227fd4df843d82ecd558b614b2
parent c3ee35f339ce6b67f8e3b17f48a2dc0f9959db3f
parent c3ce0d0f9b4a4be2df370407ee5540a7dd6f67e4

Merge "audio policy: fix regression in Audio MMAP device selection"

services/camera/libcameraservice/CameraService.cpp

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;