diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-23 10:31:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-23 10:31:25 -0700 |
| commit | 77d5554b5a18351993414c277b9f41c3710e6803 (patch) | |
| tree | 2429743c92099e8c83ce3450a1da1b6e041d1280 /services | |
| parent | c07073b8bb25e90dfe77c83a0badb4773b0377ec (diff) | |
| parent | b66e9d6bcc45fabd1a8490d968d58cac8e1ac70c (diff) | |
| download | frameworks_av-77d5554b5a18351993414c277b9f41c3710e6803.zip frameworks_av-77d5554b5a18351993414c277b9f41c3710e6803.tar.gz frameworks_av-77d5554b5a18351993414c277b9f41c3710e6803.tar.bz2 | |
Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ size_t Camera2Client::calculateBufferSize(int width, int height, 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(); |