Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07fd6c21 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

am 6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-dev 

* commit '6ccc3c34':
  Camera2: Increase mode update timeout.
parents daf30337 77d5554b

services/camera/libcameraservice/Camera2Client.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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();