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

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

am 74e58c55: Merge "Camera2: Increase capture timeout." into jb-mr1-dev

* commit '74e58c55':
  Camera2: Increase capture timeout.
parents 0e004bd9 74e58c55
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;