diff options
| author | Mansoor Aftab <maftab@codeaurora.org> | 2013-05-22 12:17:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-22 12:17:38 -0700 |
| commit | 1d60db8bfce9becee9d101eacc58e2a673221622 (patch) | |
| tree | 10ed5d29797641f941421c2bce9c4db6a31fb1a0 /services | |
| parent | cf2148e863e2fed037aa0793d2822d9898289f17 (diff) | |
| parent | c2c874d88df1b4be52f5415de6606785691bba1f (diff) | |
| download | frameworks_av-1d60db8bfce9becee9d101eacc58e2a673221622.zip frameworks_av-1d60db8bfce9becee9d101eacc58e2a673221622.tar.gz frameworks_av-1d60db8bfce9becee9d101eacc58e2a673221622.tar.bz2 | |
am c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestamp
* commit 'c2c874d88df1b4be52f5415de6606785691bba1f':
Camera3: Fix Bug minTimestamp is never greater than frame timestamp
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/camera2/ZslProcessor3.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/camera2/ZslProcessor3.cpp b/services/camera/libcameraservice/camera2/ZslProcessor3.cpp index defcafc..e2c120c 100644 --- a/services/camera/libcameraservice/camera2/ZslProcessor3.cpp +++ b/services/camera/libcameraservice/camera2/ZslProcessor3.cpp @@ -384,7 +384,7 @@ nsecs_t ZslProcessor3::getCandidateTimestampLocked(size_t* metadataIdx) const { continue; } nsecs_t frameTimestamp = entry.data.i64[0]; - if (minTimestamp > frameTimestamp) { + if (minTimestamp > frameTimestamp || minTimestamp == -1) { entry = frame.find(ANDROID_CONTROL_AE_STATE); if (entry.count == 0) { |