commit 161c953eae05a71309ae5ed03213dec23c907cf6
author Dimitry Ivanov <dimitry@google.com> Fri Feb 12 14:39:48 2016 -0800
committer Dimitry Ivanov <dimitry@google.com> Fri Feb 12 14:39:48 2016 -0800
tree 51cf355245bf83e2e99c1a16425cc0ef0c548e06
parent e27e223dedcc8f7970d550cebd4a7dda3599ef03

Fix warning: list conflicting ids (not cameraId)

Change-Id: Iad75866ab4edd500a32c5ca7e7c89d8af246f5d2

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 3deb396..41d812b 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -2353,7 +2353,7 @@
                 result.appendFormat("  Resource Cost: %d\n", state.second->getCost());
                 result.appendFormat("  Conflicting Devices:");
                 for (auto& id : conflicting) {
-                    result.appendFormat(" %s", cameraId.string());
+                    result.appendFormat(" %s", id.string());
                 }
                 if (conflicting.size() == 0) {
                     result.appendFormat(" NONE");