diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-18 17:58:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-18 17:58:26 -0700 |
| commit | 74e58c55bc5259b957a51f1bb44a5911ad1f8400 (patch) | |
| tree | 6d8b2be02ef95ee91f60b0f391f95a405560c2ab | |
| parent | 2f93127de30bbe17707ca8923c486d4494ffda37 (diff) | |
| parent | 1f266efe8ce2976b6531fab8698716354b2247f8 (diff) | |
Merge "Camera2: Increase capture timeout." into jb-mr1-dev
| -rw-r--r-- | services/camera/libcameraservice/camera2/CaptureSequencer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/camera2/CaptureSequencer.h b/services/camera/libcameraservice/camera2/CaptureSequencer.h index 39ae079b..c5c56543 100644 --- a/services/camera/libcameraservice/camera2/CaptureSequencer.h +++ b/services/camera/libcameraservice/camera2/CaptureSequencer.h @@ -93,7 +93,7 @@ class CaptureSequencer: static const nsecs_t kWaitDuration = 100000000; // 100 ms static const int kMaxTimeoutsForPrecaptureStart = 2; // 200 ms static const int kMaxTimeoutsForPrecaptureEnd = 10; // 1 sec - static const int kMaxTimeoutsForCaptureEnd = 20; // 2 sec + static const int kMaxTimeoutsForCaptureEnd = 40; // 4 sec wp<Camera2Client> mClient; wp<ZslProcessor> mZslProcessor; |