diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-23 10:38:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 10:38:09 -0700 |
| commit | e2097a5a3ea4e11b6dfa53a67ae6c101faeadcdb (patch) | |
| tree | 94dfb9278a39641ee7bfe98bf4a0e88ba38a4e58 | |
| parent | 9710001a79a914c7d1cffbaca362de12cd84c820 (diff) | |
| parent | 9e83f44c0b310a72a080c006ebc3c07bdccc7027 (diff) | |
| download | frameworks_av-e2097a5a3ea4e11b6dfa53a67ae6c101faeadcdb.zip frameworks_av-e2097a5a3ea4e11b6dfa53a67ae6c101faeadcdb.tar.gz frameworks_av-e2097a5a3ea4e11b6dfa53a67ae6c101faeadcdb.tar.bz2 | |
am 9e83f44c: am 6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
* commit '9e83f44c0b310a72a080c006ebc3c07bdccc7027':
Camera2: Increase mode update timeout.
| -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(); |