summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-10-23 09:09:01 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-10-23 09:14:48 -0700
commitb66e9d6bcc45fabd1a8490d968d58cac8e1ac70c (patch)
treedc469806cd27fd3fd5b1076184f87cc280c87f9e /services
parentdf4fca94ecad030e980e0c0f6b7d9711726d9638 (diff)
downloadframeworks_av-b66e9d6bcc45fabd1a8490d968d58cac8e1ac70c.zip
frameworks_av-b66e9d6bcc45fabd1a8490d968d58cac8e1ac70c.tar.gz
frameworks_av-b66e9d6bcc45fabd1a8490d968d58cac8e1ac70c.tar.bz2
Camera2: Increase mode update timeout.
During camera startup, it might take a few hundred milliseconds before requests start to be dequeued by the HAL. Increase the timeout for synchronizing mode changes and triggers so that triggers near startup don't time out. Bug: 6970465 Change-Id: I9dc35378e8018ec18ae31be874fcb094f8a9a0e9
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/Camera2Client.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp
index 0675400..94630f9 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -1614,7 +1614,7 @@ size_t Camera2Client::calculateBufferSize(int width, int height,
status_t Camera2Client::syncWithDevice() {
ATRACE_CALL();
- const nsecs_t kMaxSyncTimeout = 100000000; // 100 ms
+ const nsecs_t kMaxSyncTimeout = 500000000; // 500 ms
status_t res;
int32_t activeRequestId = mStreamingProcessor->getActiveRequestId();