summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-08-05 18:42:34 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-08-05 18:42:34 +0000
commit997adc05e8ba90615e15e90869e105f78f28ac09 (patch)
tree790991563f227dfc2ef664b844b9a1b553e09c1b
parentf76a0f837625b18ffbabfc4131c2fb707c7f9a65 (diff)
parentedace1ab7604b024fde370dc53d479a6efa4e754 (diff)
Merge "ImageWriter: increase timeout for BufDetachThread" into qt-qpr1-dev
-rw-r--r--media/jni/android_media_ImageWriter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_ImageWriter.cpp b/media/jni/android_media_ImageWriter.cpp
index cfcba76d3af2..9e81dda662f7 100644
--- a/media/jni/android_media_ImageWriter.cpp
+++ b/media/jni/android_media_ImageWriter.cpp
@@ -126,7 +126,7 @@ private:
Condition mCondition;
std::deque<wp<Surface>> mQueue;
- static const nsecs_t kWaitDuration = 20000000; // 20 ms
+ static const nsecs_t kWaitDuration = 500000000; // 500 ms
};
sp<DetachThread> mThread;