diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-08-06 14:32:02 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2014-08-27 11:08:10 -0700 |
| commit | 1754351d9199721e7e7943461689e399ef015260 (patch) | |
| tree | 5e0fa67a3a220dad0bdb11c2a883db25d4af3269 /include/camera | |
| parent | 60ffbe05857b7583f4c70c31914947476a908b5b (diff) | |
| download | frameworks_av-1754351d9199721e7e7943461689e399ef015260.zip frameworks_av-1754351d9199721e7e7943461689e399ef015260.tar.gz frameworks_av-1754351d9199721e7e7943461689e399ef015260.tar.bz2 | |
CameraService: Correct API2 error handling
- Add more error codes to the binder camera2 callbacks
- Translate HAL errors to callback errors
- When flushing, report failures for queued requests
- Treat stream config failure as nonfatal
- Send request errors when buffers aren't available for captures
Bug: 15524101
Bug: 14448494
Bug: 11272459
Bug: 17160301
Change-Id: I81aa54e805a9cce1cb8a6a9374549daa7666deb2
Diffstat (limited to 'include/camera')
| -rw-r--r-- | include/camera/camera2/ICameraDeviceCallbacks.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/camera/camera2/ICameraDeviceCallbacks.h b/include/camera/camera2/ICameraDeviceCallbacks.h index f059b3d..670480b 100644 --- a/include/camera/camera2/ICameraDeviceCallbacks.h +++ b/include/camera/camera2/ICameraDeviceCallbacks.h @@ -42,9 +42,13 @@ public: * Error codes for CAMERA_MSG_ERROR */ enum CameraErrorCode { + ERROR_CAMERA_INVALID_ERROR = -1, // To indicate all invalid error codes ERROR_CAMERA_DISCONNECTED = 0, ERROR_CAMERA_DEVICE = 1, - ERROR_CAMERA_SERVICE = 2 + ERROR_CAMERA_SERVICE = 2, + ERROR_CAMERA_REQUEST = 3, + ERROR_CAMERA_RESULT = 4, + ERROR_CAMERA_BUFFER = 5, }; // One way |