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 | 6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc (patch) | |
| tree | bb64afd7630b446426e1b5471685171b10d0039e /services | |
| parent | 5f6f5b7d6be5d7882102bf0fc3c691ef8fbe03a1 (diff) | |
| parent | 43b7ac6bd1a949ecb8ffc7e50d0a2f01a6258034 (diff) | |
| download | frameworks_av-6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc.zip frameworks_av-6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc.tar.gz frameworks_av-6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc.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(); |