commit 1dbf7248eaafd8a44b972b2b6d77c5a6c34fd112
author Igor Murashkin <iam@google.com> Wed Sep 24 20:58:18 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 24 20:58:18 2014 +0000
tree 0481ff61da16560bf8c64b42a6502017a0fc664a
parent b294eac086e7dba9c13cfb6cb4e24e39a1b88631
parent 3e2c14f3d64b66e155e623c6cda22848eb3f5314

Merge "camera2: Increase preview frame timeout" into lmp-dev

core/java/android/hardware/camera2/legacy/RequestThreadManager.java

diff --git a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
index 788b6d8..4f8fe0b 100644
--- a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
+++ b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
@@ -78,7 +78,7 @@
 
     private static final int MAX_IN_FLIGHT_REQUESTS = 2;
 
-    private static final int PREVIEW_FRAME_TIMEOUT = 300; // ms
+    private static final int PREVIEW_FRAME_TIMEOUT = 1000; // ms
     private static final int JPEG_FRAME_TIMEOUT = 3000; // ms (same as CTS for API2)
     private static final int REQUEST_COMPLETE_TIMEOUT = 3000; // ms (same as JPEG timeout)