commit fe7e0c6154309f2491463ee6ca4920d225289638
author Alex Ray <aray@google.com> Thu May 30 00:12:13 2013 -0700
committer Alex Ray <aray@google.com> Thu May 30 12:07:12 2013 -0700
tree c0bc36d99a692840d5537ba818eb4fab5026f1bf
parent 20cb300bce9a2b80966a422ef2de35b18533e1dd

camera: Dont segfault when result lacks timestamp

Also make a log message more useful.

Change-Id: Id8b65a9b55e1ebe41598dc2db4b0b2aa3f161965

services/camera/libcameraservice/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/Camera3Device.cpp b/services/camera/libcameraservice/Camera3Device.cpp
index 0b5e9c4..3f2287f 100644
--- a/services/camera/libcameraservice/Camera3Device.cpp
+++ b/services/camera/libcameraservice/Camera3Device.cpp
@@ -723,7 +723,7 @@
 status_t Camera3Device::createDefaultRequest(int templateId,
         CameraMetadata *request) {
     ATRACE_CALL();
-    ALOGV("%s: E", __FUNCTION__);
+    ALOGV("%s: for template %d", __FUNCTION__, templateId);
     Mutex::Autolock l(mLock);
 
     switch (mStatus) {
@@ -1254,8 +1254,7 @@
         if (entry.count == 0) {
             SET_ERR("No timestamp provided by HAL for frame %d!",
                     frameNumber);
-        }
-        if (timestamp != entry.data.i64[0]) {
+        } else if (timestamp != entry.data.i64[0]) {
             SET_ERR("Timestamp mismatch between shutter notify and result"
                     " metadata for frame %d (%lld vs %lld respectively)",
                     frameNumber, timestamp, entry.data.i64[0]);