commit f24971237e8647028c4498f76bffc7b90afabe74
author Lajos Molnar <lajos@google.com> Sat Feb 13 00:20:38 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 13 00:20:39 2016 +0000
tree 8eabce347ad58a8715a63be3143f3acd4885a352
parent a888e63c1669b536be43bd6c09ff45fe3eb1db3f
parent f4d7011d71c52647f0d41daa1b5dd41759d429ec

Merge changes I3aa5872e,I914bcc88,Icc6d023f,Ic262482a

* changes:
  stagefright: use small timeout for input buffer in SimpleDecodingSource
  stagefright: CodecCapabilities: fix missing capabilities
  stagefright: ACodec: remove infinite loops
  stagefright: ACodec: query color format support on specific port

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");