commit c4b79198825529a4a40a12157c1f9310f8dc6f62
author Igor Murashkin <iam@google.com> Wed Sep 24 21:07:24 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 24 21:07:24 2014 +0000
tree ba5484bb30bcebe57f2c5d71dda6540fd2444912
parent b266728cce07b58d2f998e0c75941ec7c53097a0
parent 1dbf7248eaafd8a44b972b2b6d77c5a6c34fd112

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

* commit '7ddc2313a35637f087b68fea385df9d56b7f3f6d':
  camera2: Increase preview frame timeout

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)