diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-09-13 11:39:24 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2013-09-16 09:33:36 -0700 |
| commit | 2f876f9ee63396e4e0117f85c5b3132cac7e2c9d (patch) | |
| tree | dbf8c6668faf4b7d3777692c06ecfdedbf49ba45 /services/camera/libcameraservice/device3/Camera3Device.h | |
| parent | d176ec1e371a686c58385692a28da677e398c302 (diff) | |
| download | frameworks_av-2f876f9ee63396e4e0117f85c5b3132cac7e2c9d.zip frameworks_av-2f876f9ee63396e4e0117f85c5b3132cac7e2c9d.tar.gz frameworks_av-2f876f9ee63396e4e0117f85c5b3132cac7e2c9d.tar.bz2 | |
Camera3: Always set a trigger ID for an active trigger
This is to work around HAL implementations that expect to see an
ID for every trigger.
Use a dummy trigger ID of 1, since 0 has special meaning for older
HALs.
Bug: 10720617
Change-Id: I9cb1b8dbcb113cb9e737e5adb04032fd61a54c12
Diffstat (limited to 'services/camera/libcameraservice/device3/Camera3Device.h')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Device.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.h b/services/camera/libcameraservice/device3/Camera3Device.h index 0b3ad6e..61caf13 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.h +++ b/services/camera/libcameraservice/device3/Camera3Device.h @@ -314,6 +314,10 @@ class Camera3Device : // restoring the old field values for those tags. status_t removeTriggers(const sp<CaptureRequest> &request); + // HAL workaround: Make sure a trigger ID always exists if + // a trigger does + status_t addDummyTriggerIds(const sp<CaptureRequest> &request); + static const nsecs_t kRequestTimeout = 50e6; // 50 ms // Waits for a request, or returns NULL if times out. |