diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-12-08 00:47:11 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-12-08 00:47:12 +0000 |
commit | b985e3c6bab78c60ef53164f157dd5bccf3045f9 (patch) | |
tree | 5052b007fefac8f4565d6aef84d3e64ef6d3e79a /camera/CameraBase.cpp | |
parent | 1081e9ac62c7fb4998037272d47954fd62100016 (diff) | |
parent | 0ccb13b8dd4f3e412d20ccb8c7587f1fac4d1152 (diff) |
Merge "Log correct reason for camera connect failures"
Diffstat (limited to 'camera/CameraBase.cpp')
-rw-r--r-- | camera/CameraBase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/CameraBase.cpp b/camera/CameraBase.cpp index 194e1d3a7c..68e73f2051 100644 --- a/camera/CameraBase.cpp +++ b/camera/CameraBase.cpp @@ -138,7 +138,7 @@ sp<TCam> CameraBase<TCam, TCamTraits>::connect(int cameraId, c->mStatus = NO_ERROR; } else { ALOGW("An error occurred while connecting to camera %d: %s", cameraId, - (cs != nullptr) ? "Service not available" : ret.toString8().string()); + (cs == nullptr) ? "Service not available" : ret.toString8().string()); c.clear(); } return c; |