diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-04-14 00:38:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-14 00:38:14 +0000 |
| commit | 4264bbd7af97aeae87f1907b96f62e4025c989d0 (patch) | |
| tree | 2581a864c2deb9eb9c5b8db4c52c7fb0ed0a6c0a /services/camera/libcameraservice/CameraService.h | |
| parent | cf31941ef4cf1a882cc23743ada41e49f8e1be03 (diff) | |
| parent | 4f9576bf48c5909782c12490e8a9faa974ae68d6 (diff) | |
| download | frameworks_av-4264bbd7af97aeae87f1907b96f62e4025c989d0.zip frameworks_av-4264bbd7af97aeae87f1907b96f62e4025c989d0.tar.gz frameworks_av-4264bbd7af97aeae87f1907b96f62e4025c989d0.tar.bz2 | |
Merge "camera: Fix client eviction/disconnect race."
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index 9eda205..91c7d59 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -90,6 +90,9 @@ public: // 3 second busy timeout when other clients are connecting static const nsecs_t DEFAULT_CONNECT_TIMEOUT_NS = 3000000000; + // 1 second busy timeout when other clients are disconnecting + static const nsecs_t DEFAULT_DISCONNECT_TIMEOUT_NS = 1000000000; + // Default number of messages to store in eviction log static const size_t DEFAULT_EVENT_LOG_LENGTH = 100; |