commit 93a209fe6ee0c7251afe47153f6af5ad38b8dde9
author Andreas Huber <andih@google.com> Tue Oct 23 15:06:11 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 23 15:06:11 2012 -0700
tree 35100b87c9d676023a1759bebc60ae38b30f37b4
parent 77d5554b5a18351993414c277b9f41c3710e6803
parent 0fc13f2d10035f0bf8505d4fb4edb1bcc5ac34ea

Merge "Don't attempt to seek audio and video separately." into jb-mr1-dev

services/camera/libcameraservice/Camera2Client.cpp

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 @@
 
 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();